mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-06-10 08:37:02 +00:00
Compare commits
116 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6375921282 | |||
| 792549c904 | |||
| 50eea8421b | |||
| 9ea710ba0e | |||
| 4940ece62a | |||
| eed6c74e0c | |||
| ee7d639a0e | |||
| 7fc2a134b7 | |||
| bd1d52b220 | |||
| d8e42d2fd8 | |||
| 8b6ff83c19 | |||
| 82f2e9dca1 | |||
| 414ef03706 | |||
| f668767765 | |||
| 2b8de735dc | |||
| 21250f8ea8 | |||
| dc69f69e74 | |||
| f28b2a7c1e | |||
| 1b1a15edba | |||
| 1f94bc8af0 | |||
| 335db2aac2 | |||
| f5f19a488f | |||
| a78622e69a | |||
| 01e3f8247d | |||
| 1937bf9690 | |||
| 517543babd | |||
| 751cc9e16f | |||
| a9f722b453 | |||
| cbeb056e08 | |||
| da5490b662 | |||
| 99307a0ebe | |||
| f73bfa6283 | |||
| 34aec1c790 | |||
| e17415591a | |||
| 28c8faf997 | |||
| 54b9817061 | |||
| 4f9725c5d4 | |||
| 71b2ae78c4 | |||
| 66adab1ac0 | |||
| 3ceb97c173 | |||
| 4f4420c713 | |||
| dd0e4269a1 | |||
| 32a0b97ce3 | |||
| a0e7a80ac9 | |||
| 62295caa39 | |||
| a529bac3b4 | |||
| 660f7cec08 | |||
| bf4c721fe0 | |||
| b7317a4db6 | |||
| 052c0e6ff3 | |||
| 0722cf95be | |||
| b6ddc024fe | |||
| acbfffd361 | |||
| b1ca6f4997 | |||
| b4057096ac | |||
| 62396eee0d | |||
| e31a493785 | |||
| fb3ff3acbf | |||
| 1a4093220f | |||
| a5cc10295d | |||
| e9716690de | |||
| 5d10dcb284 | |||
| 1a7d50463a | |||
| cfd8f7f47d | |||
| 6cef8a1bfc | |||
| 69afd5c857 | |||
| 7a499f3d0a | |||
| e52f3944ee | |||
| 2f7b98ddff | |||
| a50f28424d | |||
| 26c74fd556 | |||
| d2d59eb207 | |||
| 21649225d0 | |||
| 9cfaad674c | |||
| 0b0f848377 | |||
| 79b24149dc | |||
| 24c88f3fd2 | |||
| 2082fb6bbc | |||
| f976c55726 | |||
| 1514c05435 | |||
| 55c08cab00 | |||
| 2b1ec334e8 | |||
| 99704807d0 | |||
| dabb7d0224 | |||
| 1a2d168a7f | |||
| abaea7b4c2 | |||
| a1c818bc38 | |||
| f178b49cc1 | |||
| 1d546bbb59 | |||
| 5a474d92d9 | |||
| 795baf903b | |||
| b4c0266461 | |||
| 3a988938b2 | |||
| 7c0df4f701 | |||
| 1d27e165e6 | |||
| 22d2db35b1 | |||
| a75d1c48bf | |||
| 74b98b369e | |||
| 74dee77fac | |||
| 70100ba5ef | |||
| de72608519 | |||
| 02c9a7475b | |||
| c2e48d3524 | |||
| b615acf413 | |||
| 379b3d9e5a | |||
| abbe6a85cf | |||
| 20835baa0c | |||
| a32568cc9c | |||
| c6748dc450 | |||
| 4c73a123ca | |||
| b0c4f97ba2 | |||
| 6288665170 | |||
| 3517ba3039 | |||
| 1b696a1242 | |||
| ff7443b566 | |||
| fedb0a65df |
@@ -0,0 +1,20 @@
|
|||||||
|
# https://editorconfig.org
|
||||||
|
|
||||||
|
# Tip: to find files violating the rules set out here, run `docker run --rm --volume=$PWD:/check mstruebing/editorconfig-checker`
|
||||||
|
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
charset = utf-8
|
||||||
|
end_of_line = lf
|
||||||
|
indent_size = 4
|
||||||
|
indent_style = space
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.yaml]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
|
||||||
|
[*.yml]
|
||||||
|
indent_size = 2
|
||||||
@@ -31,6 +31,7 @@ updates:
|
|||||||
- "/Containers/collabora"
|
- "/Containers/collabora"
|
||||||
- "/Containers/docker-socket-proxy"
|
- "/Containers/docker-socket-proxy"
|
||||||
- "/Containers/domaincheck"
|
- "/Containers/domaincheck"
|
||||||
|
- "/Containers/eurooffice"
|
||||||
- "/Containers/fulltextsearch"
|
- "/Containers/fulltextsearch"
|
||||||
- "/Containers/imaginary"
|
- "/Containers/imaginary"
|
||||||
- "/Containers/mastercontainer"
|
- "/Containers/mastercontainer"
|
||||||
|
|||||||
@@ -3,3 +3,8 @@
|
|||||||
-
|
-
|
||||||
- Before sending a pull request that fixes a security issue please report it via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/). This allows us to coordinate the fix and release without potentially exposing all Nextcloud servers and users in the meantime.
|
- Before sending a pull request that fixes a security issue please report it via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/). This allows us to coordinate the fix and release without potentially exposing all Nextcloud servers and users in the meantime.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
<!-- Please check the below checkmarks if applicable -->
|
||||||
|
|
||||||
|
- [ ] The PR was tested and verified that it works locally
|
||||||
|
- [ ] The PR was completely or partially created with AI
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ jobs:
|
|||||||
action:
|
action:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v5
|
- uses: dessant/lock-threads@89ae32b08ed1a541efecbab17912962a5e38981c # v5
|
||||||
with:
|
with:
|
||||||
issue-inactive-days: '14'
|
issue-inactive-days: '14'
|
||||||
process-only: 'issues'
|
process-only: 'issues'
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
|
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
|
||||||
with:
|
with:
|
||||||
node-version: lts/*
|
node-version: 24.15.0
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: cd php/tests && npm ci
|
run: cd php/tests && npm ci
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
|
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
|
||||||
with:
|
with:
|
||||||
node-version: lts/*
|
node-version: 24.15.0
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: cd php/tests && npm ci
|
run: cd php/tests && npm ci
|
||||||
|
|||||||
@@ -47,7 +47,14 @@ http://{$APACHE_HOST}.nextcloud-aio:23973, # For Collabora callback and WOPI req
|
|||||||
uri strip_prefix /onlyoffice
|
uri strip_prefix /onlyoffice
|
||||||
reverse_proxy {$ONLYOFFICE_HOST}:80 {
|
reverse_proxy {$ONLYOFFICE_HOST}:80 {
|
||||||
header_up X-Forwarded-Host {http.request.hostport}/onlyoffice
|
header_up X-Forwarded-Host {http.request.hostport}/onlyoffice
|
||||||
header_up X-Forwarded-Proto https
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# EuroOffice
|
||||||
|
route /eurooffice/* {
|
||||||
|
uri strip_prefix /eurooffice
|
||||||
|
reverse_proxy {$EUROOFFICE_HOST}:80 {
|
||||||
|
header_up X-Forwarded-Host {http.request.hostport}/eurooffice
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,7 +85,7 @@ http://{$APACHE_HOST}.nextcloud-aio:23973, # For Collabora callback and WOPI req
|
|||||||
# TLS options
|
# TLS options
|
||||||
tls {
|
tls {
|
||||||
issuer acme {
|
issuer acme {
|
||||||
profile shortlived
|
profile tlsserver
|
||||||
# Disable HTTP challenge because that would require port 80, which we don't get (it's exposed to the mastercontainer).
|
# Disable HTTP challenge because that would require port 80, which we don't get (it's exposed to the mastercontainer).
|
||||||
# This container by default only exposes port 443 if not configured otherwise via APACHE_PORT.
|
# This container by default only exposes port 443 if not configured otherwise via APACHE_PORT.
|
||||||
disable_http_challenge
|
disable_http_challenge
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
FROM caddy:2.11.3-alpine AS caddy
|
FROM caddy:2.11.4-alpine AS caddy
|
||||||
|
|
||||||
# From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile
|
# From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile
|
||||||
FROM httpd:2.4.67-alpine3.23
|
FROM httpd:2.4.67-alpine3.23
|
||||||
@@ -103,6 +103,7 @@ CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Apache and Caddy for Nextcloud AIO" \
|
org.opencontainers.image.title="Apache and Caddy for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Apache HTTP server with Caddy for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Apache HTTP server with Caddy for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ USER root
|
|||||||
|
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Borgbackup for Nextcloud AIO" \
|
org.opencontainers.image.title="Borgbackup for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="BorgBackup-based backup service for Nextcloud All-in-One" \
|
org.opencontainers.image.description="BorgBackup-based backup service for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
|
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="ClamAV for Nextcloud AIO" \
|
org.opencontainers.image.title="ClamAV for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="ClamAV antivirus scanner for Nextcloud All-in-One" \
|
org.opencontainers.image.description="ClamAV antivirus scanner for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ USER 1001
|
|||||||
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Collabora Online for Nextcloud AIO" \
|
org.opencontainers.image.title="Collabora Online for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Collabora Online document editor from upstream for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Collabora Online document editor from upstream for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile
|
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile
|
||||||
FROM collabora/code:25.04.9.4.1
|
FROM collabora/code:26.04.1.3.1
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
@@ -13,6 +13,7 @@ USER 1001
|
|||||||
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Collabora for Nextcloud AIO" \
|
org.opencontainers.image.title="Collabora for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Collabora CODE document editor for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Collabora CODE document editor for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
FROM haproxy:3.3.10-alpine
|
FROM haproxy:3.4.0-alpine
|
||||||
|
|
||||||
# hadolint ignore=DL3002
|
# hadolint ignore=DL3002
|
||||||
USER root
|
USER root
|
||||||
@@ -20,6 +20,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Docker Socket Proxy for Nextcloud AIO" \
|
org.opencontainers.image.title="Docker Socket Proxy for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="HAProxy-based Docker socket proxy for Nextcloud All-in-One" \
|
org.opencontainers.image.description="HAProxy-based Docker socket proxy for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
HEALTHCHECK CMD nc -z 127.0.0.1 $APACHE_PORT || exit 1
|
HEALTHCHECK CMD nc -z 127.0.0.1 $APACHE_PORT || exit 1
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Domain Check for Nextcloud AIO" \
|
org.opencontainers.image.title="Domain Check for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Domain validation service for Nextcloud All-in-One setup" \
|
org.opencontainers.image.description="Domain validation service for Nextcloud All-in-One setup" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
# syntax=docker/dockerfile:latest
|
||||||
|
FROM ghcr.io/euro-office/documentserver:v9.3.1-beta.1
|
||||||
|
|
||||||
|
# USER root is probably used
|
||||||
|
|
||||||
|
COPY --chmod=775 healthcheck.sh /healthcheck.sh
|
||||||
|
|
||||||
|
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
||||||
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
|
org.opencontainers.image.title="EuroOffice for Nextcloud AIO" \
|
||||||
|
org.opencontainers.image.description="EuroOffice Document Server for Nextcloud All-in-One" \
|
||||||
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
org.opencontainers.image.source="https://github.com/nextcloud/all-in-one" \
|
||||||
|
org.opencontainers.image.vendor="Nextcloud" \
|
||||||
|
org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md"
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
|
||||||
|
set -x
|
||||||
|
fi
|
||||||
|
|
||||||
|
nc -z 127.0.0.1 80 || exit 1
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
# Probably from here https://github.com/elastic/dockerfiles/blob/9.3/elasticsearch/Dockerfile
|
# Probably from here https://github.com/elastic/dockerfiles/blob/9.3/elasticsearch/Dockerfile
|
||||||
FROM elasticsearch:9.4.1
|
FROM elasticsearch:9.4.2
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
@@ -21,6 +21,7 @@ USER 1000:0
|
|||||||
HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD /healthcheck.sh
|
HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Full Text Search for Nextcloud AIO" \
|
org.opencontainers.image.title="Full Text Search for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Elasticsearch-based full-text search for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Elasticsearch-based full-text search for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
|
|||||||
set -x
|
set -x
|
||||||
fi
|
fi
|
||||||
|
|
||||||
curl -fs "http://127.0.0.1:9200/_cluster/health?filter_path=status" | grep -qE '"status":"(green|yellow)"' || exit 1
|
curl -fs -u "elastic:$FULLTEXTSEARCH_PASSWORD" "http://127.0.0.1:9200/_cluster/health?filter_path=status" | grep -qE '"status":"(green|yellow)"' || exit 1
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
FROM golang:1.26.3-alpine3.23 AS go
|
FROM golang:1.26.4-alpine3.23 AS go
|
||||||
|
|
||||||
ENV IMAGINARY_HASH=6a274b488759a896aff02f52afee6e50b5e3a3ee
|
ENV IMAGINARY_HASH=6a274b488759a896aff02f52afee6e50b5e3a3ee
|
||||||
|
|
||||||
@@ -45,6 +45,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Imaginary for Nextcloud AIO" \
|
org.opencontainers.image.title="Imaginary for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="High-performance image processing service for Nextcloud All-in-One" \
|
org.opencontainers.image.description="High-performance image processing service for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
# Docker CLI is a requirement
|
# Docker CLI is a requirement
|
||||||
FROM docker:29.5.0-cli AS docker
|
FROM docker:29.5.2-cli AS docker
|
||||||
|
|
||||||
ARG CADDY_REMOTE_HOST_HASH=e80a9931765a8dbcbb47db415863387f0df0e1b3
|
ARG CADDY_REMOTE_HOST_HASH=e80a9931765a8dbcbb47db415863387f0df0e1b3
|
||||||
|
|
||||||
# Caddy is a requirement
|
# Caddy is a requirement
|
||||||
FROM caddy:2.11.3-builder-alpine AS caddy
|
FROM caddy:2.11.4-builder-alpine AS caddy
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
xcaddy build --with github.com/muety/caddy-remote-host@"$CADDY_REMOTE_HOST_HASH"; \
|
xcaddy build --with github.com/muety/caddy-remote-host@"$CADDY_REMOTE_HOST_HASH"; \
|
||||||
/usr/bin/caddy list-modules
|
/usr/bin/caddy list-modules
|
||||||
@@ -107,6 +107,7 @@ LABEL org.opencontainers.image.title="Nextcloud All-in-One Mastercontainer" \
|
|||||||
org.opencontainers.image.vendor="Nextcloud" \
|
org.opencontainers.image.vendor="Nextcloud" \
|
||||||
org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md" \
|
org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
com.docker.compose.project="nextcloud-aio"
|
com.docker.compose.project="nextcloud-aio"
|
||||||
|
|
||||||
# hadolint ignore=DL3002
|
# hadolint ignore=DL3002
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ stdout_logfile_maxbytes=0
|
|||||||
stderr_logfile=/dev/stderr
|
stderr_logfile=/dev/stderr
|
||||||
stderr_logfile_maxbytes=0
|
stderr_logfile_maxbytes=0
|
||||||
command=/session-deduplicator.sh
|
command=/session-deduplicator.sh
|
||||||
user=root
|
user=www-data
|
||||||
|
|
||||||
[program:domain-validator]
|
[program:domain-validator]
|
||||||
# Logging is disabled as otherwise all attempts will be logged which spams the logs
|
# Logging is disabled as otherwise all attempts will be logged which spams the logs
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ ENV SOURCE_LOCATION=/usr/src/nextcloud
|
|||||||
ENV REDIS_DB_INDEX=0
|
ENV REDIS_DB_INDEX=0
|
||||||
|
|
||||||
# AIO settings start # Do not remove or change this line!
|
# AIO settings start # Do not remove or change this line!
|
||||||
ENV NEXTCLOUD_VERSION=33.0.3
|
ENV NEXTCLOUD_VERSION=33.0.5
|
||||||
ENV AIO_TOKEN=123456
|
ENV AIO_TOKEN=123456
|
||||||
ENV AIO_URL=localhost
|
ENV AIO_URL=localhost
|
||||||
# AIO settings end # Do not remove or change this line!
|
# AIO settings end # Do not remove or change this line!
|
||||||
@@ -286,6 +286,7 @@ CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Nextcloud for Nextcloud AIO" \
|
org.opencontainers.image.title="Nextcloud for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Nextcloud server with all required PHP extensions for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Nextcloud server with all required PHP extensions for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -2,4 +2,5 @@
|
|||||||
$CONFIG = array (
|
$CONFIG = array (
|
||||||
'one-click-instance' => true,
|
'one-click-instance' => true,
|
||||||
'one-click-instance.user-limit' => 100,
|
'one-click-instance.user-limit' => 100,
|
||||||
|
'update_channel' => 'stable',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
$CONFIG = array (
|
$CONFIG = array (
|
||||||
'serverid' => crc32(gethostname()) % 512,
|
'serverid' => hexdec(hash('xxh32', gethostname())) & 0x1FF,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -419,41 +419,12 @@ EOF
|
|||||||
|
|
||||||
# AIO update to latest start # Do not remove or change this line!
|
# AIO update to latest start # Do not remove or change this line!
|
||||||
if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
|
if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
|
||||||
php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
|
if ! bash /upgrade-latest-major.sh; then
|
||||||
INSTALLED_AT="$(php /var/www/html/occ config:app:get core installedat)"
|
echo "Upgrade to latest major version failed! Check the output above for details."
|
||||||
if [ -n "${INSTALLED_AT}" ]; then
|
|
||||||
# Set the installdat to 00 which will allow to skip staging and install the next major directly
|
|
||||||
# shellcheck disable=SC2001
|
|
||||||
INSTALLED_AT="$(echo "${INSTALLED_AT}" | sed "s|[0-9][0-9]$|00|")"
|
|
||||||
php /var/www/html/occ config:app:set core installedat --value="${INSTALLED_AT}"
|
|
||||||
fi
|
|
||||||
php /var/www/html/updater/updater.phar --no-interaction --no-backup
|
|
||||||
if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
|
|
||||||
echo "Installation of Nextcloud failed!"
|
|
||||||
touch "$NEXTCLOUD_DATA_DIR/install.failed"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
# shellcheck disable=SC2016
|
# shellcheck disable=SC2016
|
||||||
installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
|
installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
|
||||||
INSTALLED_MAJOR="${installed_version%%.*}"
|
|
||||||
IMAGE_MAJOR="${image_version%%.*}"
|
|
||||||
# If a valid upgrade path, trigger the Nextcloud built-in Updater
|
|
||||||
if ! [ "$INSTALLED_MAJOR" -gt "$IMAGE_MAJOR" ]; then
|
|
||||||
php /var/www/html/updater/updater.phar --no-interaction --no-backup
|
|
||||||
if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
|
|
||||||
echo "Installation of Nextcloud failed!"
|
|
||||||
# TODO: Add a hint here about what to do / where to look / updater.log?
|
|
||||||
touch "$NEXTCLOUD_DATA_DIR/install.failed"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
# shellcheck disable=SC2016
|
|
||||||
installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
|
|
||||||
fi
|
|
||||||
php /var/www/html/occ config:system:set updatechecker --type=bool --value=true
|
|
||||||
php /var/www/html/occ app:enable nextcloud-aio --force
|
|
||||||
php /var/www/html/occ db:add-missing-columns
|
|
||||||
php /var/www/html/occ db:add-missing-primary-keys
|
|
||||||
yes | php /var/www/html/occ db:convert-filecache-bigint
|
|
||||||
fi
|
fi
|
||||||
# AIO update to latest end # Do not remove or change this line!
|
# AIO update to latest end # Do not remove or change this line!
|
||||||
|
|
||||||
@@ -896,6 +867,58 @@ else
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# EuroOffice
|
||||||
|
if [ "$EUROOFFICE_ENABLED" = 'yes' ]; then
|
||||||
|
# Determine EuroOffice port based on host pattern
|
||||||
|
if echo "$EUROOFFICE_HOST" | grep -q "nextcloud-.*-eurooffice"; then
|
||||||
|
EUROOFFICE_PORT=80
|
||||||
|
else
|
||||||
|
EUROOFFICE_PORT=443
|
||||||
|
fi
|
||||||
|
|
||||||
|
count=0
|
||||||
|
while ! nc -z "$EUROOFFICE_HOST" "$EUROOFFICE_PORT" && [ "$count" -lt 90 ]; do
|
||||||
|
echo "Waiting for EuroOffice to become available..."
|
||||||
|
count=$((count+5))
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
if [ "$count" -ge 90 ]; then
|
||||||
|
bash /notify.sh "EuroOffice did not start in time!" "Skipping initialization and disabling eurooffice app."
|
||||||
|
php /var/www/html/occ app:disable eurooffice
|
||||||
|
else
|
||||||
|
# Install or enable EuroOffice app as needed
|
||||||
|
if ! [ -d "/var/www/html/custom_apps/eurooffice" ]; then
|
||||||
|
php /var/www/html/occ app:install eurooffice
|
||||||
|
elif [ "$(php /var/www/html/occ config:app:get eurooffice enabled)" != "yes" ]; then
|
||||||
|
php /var/www/html/occ app:enable eurooffice
|
||||||
|
elif [ "$SKIP_UPDATE" != 1 ]; then
|
||||||
|
php /var/www/html/occ app:update eurooffice
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set EuroOffice configuration
|
||||||
|
php /var/www/html/occ config:system:set eurooffice editors_check_interval --value="0" --type=integer
|
||||||
|
php /var/www/html/occ config:system:set eurooffice jwt_secret --value="$EUROOFFICE_SECRET"
|
||||||
|
php /var/www/html/occ config:app:set eurooffice jwt_secret --value="$EUROOFFICE_SECRET"
|
||||||
|
php /var/www/html/occ config:system:set eurooffice jwt_header --value="AuthorizationJwt"
|
||||||
|
|
||||||
|
# Adjust the EuroOffice host if using internal pattern
|
||||||
|
if echo "$EUROOFFICE_HOST" | grep -q "nextcloud-.*-eurooffice"; then
|
||||||
|
EUROOFFICE_HOST="$NC_DOMAIN/eurooffice"
|
||||||
|
export EUROOFFICE_HOST
|
||||||
|
fi
|
||||||
|
|
||||||
|
php /var/www/html/occ config:app:set eurooffice DocumentServerUrl --value="https://$EUROOFFICE_HOST"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Remove EuroOffice app if disabled and removal is requested
|
||||||
|
if [ "$REMOVE_DISABLED_APPS" = yes ] && \
|
||||||
|
[ -d "/var/www/html/custom_apps/eurooffice" ] && \
|
||||||
|
[ -n "$EUROOFFICE_SECRET" ] && \
|
||||||
|
[ "$(php /var/www/html/occ config:system:get eurooffice jwt_secret)" = "$EUROOFFICE_SECRET" ]; then
|
||||||
|
php /var/www/html/occ app:remove eurooffice
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Talk
|
# Talk
|
||||||
if [ "$TALK_ENABLED" = 'yes' ]; then
|
if [ "$TALK_ENABLED" = 'yes' ]; then
|
||||||
set -x
|
set -x
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
PHP_CLI="php"
|
||||||
|
if [[ "$EUID" = 0 ]]; then
|
||||||
|
PHP_CLI="sudo -u www-data -E $PHP_CLI"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
image_version="$($PHP_CLI -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
|
||||||
|
export IMAGE_MAJOR="${image_version%%.*}"
|
||||||
|
|
||||||
|
$PHP_CLI /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
|
||||||
|
INSTALLED_AT="$($PHP_CLI /var/www/html/occ config:app:get core installedat)"
|
||||||
|
if [ -n "${INSTALLED_AT}" ]; then
|
||||||
|
# Set the installedat to 00 which will allow to skip staging and install the next major directly
|
||||||
|
# shellcheck disable=SC2001
|
||||||
|
INSTALLED_AT="$(echo "${INSTALLED_AT}" | sed "s|[0-9][0-9]$|00|")"
|
||||||
|
$PHP_CLI /var/www/html/occ config:app:set core installedat --value="${INSTALLED_AT}"
|
||||||
|
fi
|
||||||
|
$PHP_CLI /var/www/html/updater/updater.phar --no-interaction --no-backup
|
||||||
|
if ! $PHP_CLI /var/www/html/occ -V || $PHP_CLI /var/www/html/occ status | grep maintenance | grep -q 'true'; then
|
||||||
|
echo "Installation of Nextcloud failed!"
|
||||||
|
touch "$NEXTCLOUD_DATA_DIR/install.failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
installed_version="$($PHP_CLI -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
|
||||||
|
export INSTALLED_MAJOR="${installed_version%%.*}"
|
||||||
|
# If a valid upgrade path, trigger the Nextcloud built-in Updater
|
||||||
|
if ! $PHP_CLI -r "version_compare(getenv('INSTALLED_MAJOR'), getenv('IMAGE_MAJOR'), '>') || exit(1);"; then
|
||||||
|
$PHP_CLI /var/www/html/updater/updater.phar --no-interaction --no-backup
|
||||||
|
if ! $PHP_CLI /var/www/html/occ -V || $PHP_CLI /var/www/html/occ status | grep maintenance | grep -q 'true'; then
|
||||||
|
echo "Installation of Nextcloud failed!"
|
||||||
|
# TODO: Add a hint here about what to do / where to look / updater.log?
|
||||||
|
touch "$NEXTCLOUD_DATA_DIR/install.failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
$PHP_CLI /var/www/html/occ config:system:set updatechecker --type=bool --value=true
|
||||||
|
$PHP_CLI /var/www/html/occ app:enable nextcloud-aio --force
|
||||||
|
$PHP_CLI /var/www/html/occ db:add-missing-columns
|
||||||
|
$PHP_CLI /var/www/html/occ db:add-missing-primary-keys
|
||||||
|
yes | $PHP_CLI /var/www/html/occ db:convert-filecache-bigint
|
||||||
@@ -23,6 +23,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Notify Push for Nextcloud AIO" \
|
org.opencontainers.image.title="Notify Push for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Nextcloud notify_push high-performance backend for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Nextcloud notify_push high-performance backend for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -42,6 +42,15 @@ if ! [ -f /var/www/html/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push ] &&
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Logic for ipv6 disabled servers
|
||||||
|
BIND="::"
|
||||||
|
if grep -q "1" /sys/module/ipv6/parameters/disable \
|
||||||
|
|| grep -q "1" /proc/sys/net/ipv6/conf/all/disable_ipv6 \
|
||||||
|
|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
|
||||||
|
BIND="0.0.0.0"
|
||||||
|
fi
|
||||||
|
export BIND
|
||||||
|
|
||||||
echo "notify-push was started"
|
echo "notify-push was started"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh
|
|||||||
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="OnlyOffice for Nextcloud AIO" \
|
org.opencontainers.image.title="OnlyOffice for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="OnlyOffice Document Server for Nextcloud All-in-One" \
|
org.opencontainers.image.description="OnlyOffice Document Server for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="PostgreSQL for Nextcloud AIO" \
|
org.opencontainers.image.title="PostgreSQL for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="PostgreSQL database for Nextcloud All-in-One" \
|
org.opencontainers.image.description="PostgreSQL database for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Redis for Nextcloud AIO" \
|
org.opencontainers.image.title="Redis for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Redis cache server for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Redis cache server for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ CMD ["python", "-m", "nextcloud.talk.recording", "--config", "/conf/recording.co
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Talk Recording for Nextcloud AIO" \
|
org.opencontainers.image.title="Talk Recording for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Nextcloud Talk recording service for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Nextcloud Talk recording service for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
FROM nats:2.14.0-scratch AS nats
|
FROM nats:2.14.2-scratch AS nats
|
||||||
FROM eturnal/eturnal:1.12.2-alpine AS eturnal
|
FROM eturnal/eturnal:1.12.2-alpine AS eturnal
|
||||||
FROM strukturag/nextcloud-spreed-signaling:2.1.1 AS signaling
|
FROM strukturag/nextcloud-spreed-signaling:2.1.1 AS signaling
|
||||||
FROM alpine:3.23.4 AS janus
|
FROM alpine:3.23.4 AS janus
|
||||||
@@ -112,6 +112,7 @@ CMD ["supervisord", "-c", "/supervisord.conf"]
|
|||||||
HEALTHCHECK CMD /healthcheck.sh
|
HEALTHCHECK CMD /healthcheck.sh
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Talk for Nextcloud AIO" \
|
org.opencontainers.image.title="Talk for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Nextcloud Talk with NATS, Janus, eturnal, and signaling server for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Nextcloud Talk with NATS, Janus, eturnal, and signaling server for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ if [ "$AIO_LOG_LEVEL" = 'debug' ]; then
|
|||||||
set -x
|
set -x
|
||||||
fi
|
fi
|
||||||
|
|
||||||
nc -z 127.0.0.1 8081 || exit 1
|
nc -z 127.0.0.1 8081 || nc -z ::1 8081 || exit 1
|
||||||
nc -z 127.0.0.1 8188 || exit 1
|
nc -z 127.0.0.1 8188 || exit 1
|
||||||
nc -z 127.0.0.1 4222 || exit 1
|
nc -z 127.0.0.1 4222 || exit 1
|
||||||
nc -z 127.0.0.1 "$TALK_PORT" || exit 1
|
nc -z 127.0.0.1 "$TALK_PORT" || nc -z ::1 "$TALK_PORT" || exit 1
|
||||||
eturnalctl status || exit 1
|
eturnalctl status || exit 1
|
||||||
# Verify that the signaling server is actually serving requests, not just
|
# Verify that the signaling server is actually serving requests, not just
|
||||||
# listening on the TCP port (which nc -z above only tests for open port).
|
# listening on the TCP port (which nc -z above only tests for open port).
|
||||||
wget -q -O /dev/null http://127.0.0.1:8081/api/v1/stats || exit 1
|
# SC2102: [::1] is an IPv6 address literal in a URL, not a character-range glob.
|
||||||
|
# shellcheck disable=SC2102
|
||||||
|
wget -q -O /dev/null http://127.0.0.1:8081/api/v1/stats || wget -q -O /dev/null http://[::1]:8081/api/v1/stats || exit 1
|
||||||
|
|||||||
@@ -75,6 +75,13 @@ if grep -q "1" /sys/module/ipv6/parameters/disable \
|
|||||||
|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
|
|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
|
||||||
IP_BINDING="0.0.0.0"
|
IP_BINDING="0.0.0.0"
|
||||||
fi
|
fi
|
||||||
|
# Build a listen address suitable for the signaling server's "ip:port" format.
|
||||||
|
# IPv6 needs bracket notation: [::]:8081; IPv4 keeps the plain form: 0.0.0.0:8081
|
||||||
|
if [ "$IP_BINDING" = "::" ]; then
|
||||||
|
SIGNALING_LISTEN="[::]:8081"
|
||||||
|
else
|
||||||
|
SIGNALING_LISTEN="$IP_BINDING:8081"
|
||||||
|
fi
|
||||||
if [ "$AIO_LOG_LEVEL" != 'debug' ]; then
|
if [ "$AIO_LOG_LEVEL" != 'debug' ]; then
|
||||||
set +x
|
set +x
|
||||||
fi
|
fi
|
||||||
@@ -118,7 +125,7 @@ fi
|
|||||||
# Signaling
|
# Signaling
|
||||||
cat << SIGNALING_CONF > "/conf/signaling.conf"
|
cat << SIGNALING_CONF > "/conf/signaling.conf"
|
||||||
[http]
|
[http]
|
||||||
listen = 0.0.0.0:8081
|
listen = ${SIGNALING_LISTEN}
|
||||||
readtimeout = 15
|
readtimeout = 15
|
||||||
writetimeout = 30
|
writetimeout = 30
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
FROM golang:1.26.3-alpine3.23 AS go
|
FROM golang:1.26.4-alpine3.23 AS go
|
||||||
|
|
||||||
ENV WATCHTOWER_COMMIT_HASH=1a7990e7065f1292471114b2a9c94147743de06f
|
ENV WATCHTOWER_COMMIT_HASH=9d0048403a7242943084bede951f6f966f7691ba
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
apk upgrade --no-cache -a; \
|
apk upgrade --no-cache -a; \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
build-base; \
|
build-base; \
|
||||||
go install github.com/nicholas-fedor/watchtower@$WATCHTOWER_COMMIT_HASH # v1.17.0
|
go install github.com/nicholas-fedor/watchtower@$WATCHTOWER_COMMIT_HASH # v1.17.2
|
||||||
|
|
||||||
FROM alpine:3.23.4
|
FROM alpine:3.23.4
|
||||||
|
|
||||||
@@ -27,6 +27,7 @@ ENV AIO_LOG_LEVEL="warn"
|
|||||||
ENTRYPOINT ["/start.sh"]
|
ENTRYPOINT ["/start.sh"]
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Watchtower for Nextcloud AIO" \
|
org.opencontainers.image.title="Watchtower for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Watchtower auto-update service for Nextcloud All-in-One containers" \
|
org.opencontainers.image.description="Watchtower auto-update service for Nextcloud All-in-One containers" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:latest
|
# syntax=docker/dockerfile:latest
|
||||||
# Probably from this file: https://github.com/nextcloud/whiteboard/blob/main/Dockerfile
|
# Probably from this file: https://github.com/nextcloud/whiteboard/blob/main/Dockerfile
|
||||||
FROM ghcr.io/nextcloud-releases/whiteboard:v1.5.8
|
FROM ghcr.io/nextcloud-releases/whiteboard:v1.5.9
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@@ -24,6 +24,7 @@ ENTRYPOINT ["/start.sh"]
|
|||||||
|
|
||||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||||
wud.watch="false" \
|
wud.watch="false" \
|
||||||
|
dockhand.update="false" \
|
||||||
org.opencontainers.image.title="Whiteboard for Nextcloud AIO" \
|
org.opencontainers.image.title="Whiteboard for Nextcloud AIO" \
|
||||||
org.opencontainers.image.description="Collaborative whiteboard service for Nextcloud All-in-One" \
|
org.opencontainers.image.description="Collaborative whiteboard service for Nextcloud All-in-One" \
|
||||||
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \
|
||||||
|
|||||||
+2
-9
@@ -1,19 +1,12 @@
|
|||||||
# https://editorconfig.org
|
# https://editorconfig.org
|
||||||
|
|
||||||
|
# note: the files in ./composer actually use 4 spaces instead of tabs
|
||||||
|
|
||||||
root = true
|
root = true
|
||||||
|
|
||||||
[*]
|
[*]
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
indent_size = 4
|
|
||||||
indent_style = tab
|
indent_style = tab
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
[*.feature]
|
|
||||||
indent_size = 2
|
|
||||||
indent_style = space
|
|
||||||
|
|
||||||
[*.yml]
|
|
||||||
indent_size = 2
|
|
||||||
indent_style = space
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<category>monitoring</category>
|
<category>monitoring</category>
|
||||||
<bugs>https://github.com/nextcloud/all-in-one/issues</bugs>
|
<bugs>https://github.com/nextcloud/all-in-one/issues</bugs>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<nextcloud min-version="32" max-version="33"/>
|
<nextcloud min-version="33" max-version="34"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
|
|||||||
+7
-4
@@ -1,7 +1,10 @@
|
|||||||
|
# AIO app for Nextcloud
|
||||||
|
|
||||||
|
This folder contains a Nextcloud app, which will be automatically installed within the Nextcloud instance.
|
||||||
|
It adds a link to the admin settings page that gives access to the AIO interface.
|
||||||
|
|
||||||
## How to develop the app?
|
## How to develop the app?
|
||||||
|
|
||||||
Please note that in order to check if an app is already downloaded
|
Please note that in order to check if an app is already downloaded Nextcloud will look for a folder with the same name as the app.
|
||||||
Nextcloud will look for a folder with the same name as the app.
|
|
||||||
|
|
||||||
Therefore you need to add the app to one of the app directories
|
Therefore you need to add the app to one of the app directories naming the directory `nextcloud-aio`.
|
||||||
naming the directory `nextcloud-aio`.
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Borgbackup Viewer
|
## Borgbackup Viewer
|
||||||
This container allows to view the local borg repository in a web session. It also allows you to restore files and folders from the backup by using desktop programs in a web browser.
|
This container allows to view the local borg backups repository in a web session. It also allows you to restore files and folders from the backup by using desktop programs in a web browser.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- After adding and starting the container, you need to visit `https://ip.address.of.this.server:5801` in order to log in with the user `nextcloud` and the password that you can see next to the container in the AIO interface. (The web page uses a self-signed certificate, so you need to accept the warning).
|
- After adding and starting the container, you need to visit `https://ip.address.of.this.server:5801` in order to log in with the user `nextcloud` and the password that you can see next to the container in the AIO interface. (The web page uses a self-signed certificate, so you need to accept the warning).
|
||||||
@@ -14,4 +14,3 @@ https://github.com/szaimen/aio-borgbackup-viewer
|
|||||||
|
|
||||||
### Maintainer
|
### Maintainer
|
||||||
https://github.com/szaimen
|
https://github.com/szaimen
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
## Caddy with geoblocking
|
## Caddy with geoblocking
|
||||||
This container bundles caddy and auto-configures it for you. It also covers [vaultwarden](https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden) by listening on `bw.$NC_DOMAIN`, if installed. It also covers [stalwart](https://github.com/nextcloud/all-in-one/tree/main/community-containers/stalwart) by listening on `mail.$NC_DOMAIN`, if installed. It also covers [jellyfin](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin) by listening on `media.$NC_DOMAIN`, if installed. It also covers [lldap](https://github.com/nextcloud/all-in-one/tree/main/community-containers/lldap) by listening on `ldap.$NC_DOMAIN`, if installed. It also covers [nocodb](https://github.com/nextcloud/all-in-one/tree/main/community-containers/nocodb) by listening on `tables.$NC_DOMAIN`, if installed. It also covers [seerr](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyseerr) by listening on `requests.$NC_DOMAIN`, if installed. It also covers [nextcloud-exporter](https://github.com/nextcloud/all-in-one/tree/main/community-containers/nextcloud-exporter) by listening on `metrics.$NC_DOMAIN`, if installed. It also covers [LocalAI](https://github.com/nextcloud/all-in-one/tree/main/community-containers/local-ai) by listening on `ai.$NC_DOMAIN`, if installed.
|
This container bundles [caddy](https://caddyserver.com/) and auto-configures it for you as a reverse proxy.
|
||||||
|
It also covers [vaultwarden](https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden) by listening on `bw.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [stalwart](https://github.com/nextcloud/all-in-one/tree/main/community-containers/stalwart) by listening on `mail.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [jellyfin](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin) by listening on `media.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [lldap](https://github.com/nextcloud/all-in-one/tree/main/community-containers/lldap) by listening on `ldap.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [nocodb](https://github.com/nextcloud/all-in-one/tree/main/community-containers/nocodb) by listening on `tables.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [seerr](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyseerr) by listening on `requests.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [nextcloud-exporter](https://github.com/nextcloud/all-in-one/tree/main/community-containers/nextcloud-exporter) by listening on `metrics.$NC_DOMAIN`, if installed.
|
||||||
|
It also covers [LocalAI](https://github.com/nextcloud/all-in-one/tree/main/community-containers/local-ai) by listening on `ai.$NC_DOMAIN`, if installed.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container is incompatible with the [npmplus](https://github.com/nextcloud/all-in-one/tree/main/community-containers/npmplus) community container. So make sure that you do not enable both at the same time!
|
- This container is incompatible with the [npmplus](https://github.com/nextcloud/all-in-one/tree/main/community-containers/npmplus) community container. So make sure that you do not enable both at the same time!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## calcardbackup
|
## calcardbackup
|
||||||
This container packages calcardbackup which is a tool that exports calendars and addressbooks from Nextcloud to .ics and .vcf files and saves them to a compressed file.
|
This container packages [calcardbackup](https://codeberg.org/BernieO/calcardbackup), a tool that exports calendars and addressbooks from Nextcloud to .ics and .vcf files and saves them to a compressed file.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- Backups will be created at 00:00 UTC every day. Make sure that this does not conflict with the configured daily backups inside AIO.
|
- Backups will be created at 00:00 UTC every day. Make sure that this does not conflict with the configured daily backups inside AIO.
|
||||||
@@ -12,4 +12,3 @@ https://github.com/waja/docker-calcardbackup
|
|||||||
|
|
||||||
### Maintainer
|
### Maintainer
|
||||||
https://github.com/pailloM
|
https://github.com/pailloM
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
## Container-Management
|
## Container-Management
|
||||||
This container allows to manage insides of other containers via a GUI inside a Web session by allowing to run docker commands from inside this container.
|
This container allows to manage other containers via a GUI inside a Web session by allowing to run docker commands from inside this container.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- After adding and starting the container, you need to visit `https://ip.address.of.this.server:5804` in order to log in with the user `container-management` and the password that you can see next to the container in the AIO interface. (The web page uses a self-signed certificate, so you need to accept the warning).
|
- After adding and starting the container, you need to visit `https://ip.address.of.this.server:5804` in order to log in with the user `container-management` and the password that you can see next to the container in the AIO interface. (The web page uses a self-signed certificate, so you need to accept the warning).
|
||||||
- Then, you should see a terminal. There you can use any docker command. ⚠️ Be very carefully while doing that as can break your instance!
|
- Then, you should see a terminal. There you can use any docker command. ⚠️ Be very carefully while doing that as can break your instance!
|
||||||
- There are also some pre-made scripts that make configuring some of the community containers easier. For example scripts for [LLDAP](https://github.com/nextcloud/all-in-one/tree/main/community-containers/lldap) and [Facerecognition](https://github.com/nextcloud/all-in-one/tree/main/community-containers/facerecognition).
|
- There are also some pre-made scripts that make configuring some community containers easier. For example scripts for [LLDAP](https://github.com/nextcloud/all-in-one/tree/main/community-containers/lldap) and [Facerecognition](https://github.com/nextcloud/all-in-one/tree/main/community-containers/facerecognition).
|
||||||
- ⚠️ After you are done doing your operations, remove the container for better security again from the stack: https://github.com/nextcloud/all-in-one/tree/main/community-containers#how-to-remove-containers-from-aios-stack
|
- ⚠️ After you are done doing your operations, remove the container from the stack for better security: https://github.com/nextcloud/all-in-one/tree/main/community-containers#how-to-remove-containers-from-aios-stack
|
||||||
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
|
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
|
||||||
|
|
||||||
### Repository
|
### Repository
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
## DLNA server
|
## DLNA server
|
||||||
This container bundles DLNA server for your Nextcloud files to be accessible by the clients in your local network. Simply run the container and look for a new media server `nextcloud-aio` in your local network.
|
This container bundles a DLNA multimedia streaming server for your Nextcloud files to be accessible by the clients in your local network. Simply run the container and look for a new media server `nextcloud-aio` in your local network.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container will work only if the Nextcloud installation is in your home network, it is not suitable for installations on remote servers.
|
- This container will work only if the Nextcloud installation is in your home network, it is not suitable for installations on public servers.
|
||||||
- If you have a firewall like ufw configured, you might need to open at least port 9999 TCP and 1900 UDP first in order to make it work.
|
- If you have a firewall like ufw configured, you might need to open at least port 9999 TCP and 1900 UDP first in order to make it work.
|
||||||
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
|
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
|
||||||
|
|
||||||
@@ -11,4 +11,3 @@ https://github.com/thanek/nextcloud-dlna
|
|||||||
|
|
||||||
### Maintainer
|
### Maintainer
|
||||||
https://github.com/thanek
|
https://github.com/thanek
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Facerecognition
|
## Facerecognition
|
||||||
This container bundles the external model of facerecognition and auto-configures it for you.
|
This container bundles a basic facial recognition system and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container needs imaginary in order to analyze modern file format images. Make sure to enable imaginary in the AIO interface before adding this container.
|
- This container needs imaginary in order to analyze modern file format images. Make sure to enable imaginary in the AIO interface before adding this container.
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
## Fail2ban
|
## Fail2ban
|
||||||
This container bundles fail2ban and auto-configures it for you in order to block ip-addresses automatically. It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden, https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin, and https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyseerr, if installed.
|
This container bundles [fail2ban](https://github.com/fail2ban/fail2ban) and auto-configures it for you in order to block ip-addresses automatically.
|
||||||
|
It also covers https://github.com/nextcloud/all-in-one/tree/main/community-containers/vaultwarden, https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin, and https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyseerr, if installed.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- If you get an error like `"ip6tables v1.8.9 (legacy): can't initialize ip6tables table filter': Table does not exist (do you need to insmod?)"`, you need to enable ip6tables on your host via `sudo modprobe ip6table_filter`.
|
- If you get an error like `"ip6tables v1.8.9 (legacy): can't initialize ip6tables table filter': Table does not exist (do you need to insmod?)"`, you need to enable ip6tables on your host via `sudo modprobe ip6table_filter`.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Glances
|
## Glances
|
||||||
This container starts Glances, a web-based info-board, and auto-configures it for you.
|
This container starts [Glances](https://nicolargo.github.io/glances/), a web-based system monitoring dashboard, and auto-configures it for you.
|
||||||
|
|
||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
> This container mounts the docker-socket from the host-system.
|
> This container mounts the docker-socket from the host-system.
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
## Home Assistant
|
## Home Assistant
|
||||||
This container bundles Home Assistant and auto-configures it for you.
|
This container bundles [Home Assistant](https://www.home-assistant.io/) and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container should only be run in home networks since Home Assistant is designed for local home automation.
|
- This container should only be run in home networks since Home Assistant is designed for local home automation.
|
||||||
- After adding and starting the container, you can visit `http://ip.address.of.this.server:8123` in order to set up your Home Assistant instance.
|
- After adding and starting the container, you can visit `http://ip.address.of.this.server:8123` in order to set up your Home Assistant instance.
|
||||||
- The data of Home Assistant will be automatically included in AIOs backup solution!
|
- The data of Home Assistant will be automatically included in AIOs backup solution!
|
||||||
- In order to access your Home Assistant outside the local network, you have to set up your own reverse proxy. You can set up a reverse proxy following [these instructions](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md).
|
- In order to access your Home Assistant outside the local network, you have to set up your own reverse proxy. You can set up a reverse proxy following [these instructions](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md).
|
||||||
|
- And to allow the traffic from the reverse proxy to be accepted by Home Assistant, follow [these instructions](https://www.home-assistant.io/integrations/http/#reverse-proxies) from the Home Assistant documentation.
|
||||||
|
- Or, to use the Caddy with geoblocking community container, follow the following instruction to add your own Caddyfile, to use it for Home Assistant: https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy#notes
|
||||||
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
|
- See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers how to add it to the AIO stack
|
||||||
|
|
||||||
### Repository
|
### Repository
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Jellyfin
|
## Jellyfin
|
||||||
This container bundles Jellyfin and auto-configures it for you.
|
This container bundles [Jellyfin](https://jellyfin.org/) and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container is incompatible with the [Plex](https://github.com/nextcloud/all-in-one/tree/main/community-containers/plex) community container. So make sure that you do not enable both at the same time!
|
- This container is incompatible with the [Plex](https://github.com/nextcloud/all-in-one/tree/main/community-containers/plex) community container. So make sure that you do not enable both at the same time!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Seerr
|
## Seerr
|
||||||
This container bundles Seerr and auto-configures it for you.
|
This container bundles [Seerr](https://seerr.dev/) request management and media discovery tool and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- **Migration from Jellyseerr**: Jellyseer previously ran as the root user. With the migration to Seerr, the container now runs rootless with userid 1000, meaning that if you previously used Jellyseerr, Seerr will not be able to access the config files generated by the old Jellyseerr container. To migrate, execute the following steps: 1. stop all containers using the AIO-interface, 2. run `sudo docker run --rm -v nextcloud_aio_jellyseerr:/data alpine chown -R 1000:1000 /data`
|
- **Migration from Jellyseerr**: Jellyseer previously ran as the root user. With the migration to Seerr, the container now runs rootless with userid 1000, meaning that if you previously used Jellyseerr, Seerr will not be able to access the config files generated by the old Jellyseerr container. To migrate, execute the following steps: 1. stop all containers using the AIO-interface, 2. run `sudo docker run --rm -v nextcloud_aio_jellyseerr:/data alpine chown -R 1000:1000 /data`
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## LanguageTool for Nextcloud Office
|
## LanguageTool for Nextcloud Office
|
||||||
This container bundles a LanguageTool for Nextcloud Office which adds spell checking functionality to Nextcloud Office.
|
This container bundles [LanguageTool](https://github.com/languagetool-org/languagetool) for Nextcloud Office which adds spell checking functionality to Nextcloud Office.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- Make sure to have Nextcloud Office enabled via the AIO interface
|
- Make sure to have Nextcloud Office enabled via the AIO interface
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## LibreTranslate
|
## LibreTranslate
|
||||||
This container bundles LibreTranslate and auto-configures it for you.
|
This container bundles [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate) and auto-configures it for you.
|
||||||
|
|
||||||
> [!WARNING]
|
> [!WARNING]
|
||||||
> The LibreTranslate container and app is deprecated!
|
> The LibreTranslate container and app is deprecated!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Light LDAP server
|
## Light LDAP server
|
||||||
This container bundles LLDAP server and auto-configures your Nextcloud instance for you.
|
This container bundles an [LLDAP](https://github.com/lldap/lldap) LDAP server and auto-configures your Nextcloud instance for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- In order to access your LLDAP web interface outside the local network, you have to set up your own reverse proxy. You can set up a reverse proxy following [these instructions](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md) OR use the [Caddy](https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy) community container that will automatically configure `ldap.$NC_DOMAIN` to redirect to your Lldap. You need to point the reverse proxy at port 17170 of this server.
|
- In order to access your LLDAP web interface outside the local network, you have to set up your own reverse proxy. You can set up a reverse proxy following [these instructions](https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md) OR use the [Caddy](https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy) community container that will automatically configure `ldap.$NC_DOMAIN` to redirect to your Lldap. You need to point the reverse proxy at port 17170 of this server.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Local AI
|
## Local AI
|
||||||
This container bundles Local AI and auto-configures it for you. It support hardware acceleration with Vulkan.
|
This container bundles [Local AI](https://localai.io/) and auto-configures it for you. It support hardware acceleration with Vulkan.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
Documentation is available on the container repository. This documentation is regularly updated and is intended to be as simple and detailed as possible. Thanks for all your feedback!
|
Documentation is available on the container repository. This documentation is regularly updated and is intended to be as simple and detailed as possible. Thanks for all your feedback!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## MakeMKV
|
## MakeMKV
|
||||||
This container bundles MakeMKV and auto-configures it for you.
|
This container bundles the [MakeMKV](https://www.makemkv.com/) video converter and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container should only be run in home networks
|
- This container should only be run in home networks
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Minio
|
## Minio
|
||||||
This container bundles minio s3 storage and auto-configures it for you.
|
This container bundles [minio](https://github.com/minio/minio) s3 storage and auto-configures it for you.
|
||||||
|
|
||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
> The Minio upstream project is no longer maintained. The container should still work in its current form...
|
> The Minio upstream project is no longer maintained. The container should still work in its current form...
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
> - See more here https://github.com/nextcloud/tables/issues/103
|
> - See more here https://github.com/nextcloud/tables/issues/103
|
||||||
|
|
||||||
## NocoDb server
|
## NocoDb server
|
||||||
This container bundles NocoDb without synchronization with Nextcloud.
|
This container bundles [NocoDb](https://github.com/nocodb/nocodb), an online no-code database solution, without synchronization with Nextcloud.
|
||||||
|
|
||||||
This is an alternative of **Airtable**.
|
This is an alternative of **Airtable**.
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## NPMplus
|
## NPMplus
|
||||||
This container contains a fork of the Nginx Proxy Manager, which is a WebUI for nginx. It will also automatically create a config and cert for AIO.
|
This container contains a fork of [Nginx Proxy Manager](https://nginxproxymanager.com/), which is a WebUI for nginx. It will also automatically create a config and cert for AIO.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container is incompatible with the [caddy](https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy) community container. So make sure that you do not enable both at the same time!
|
- This container is incompatible with the [caddy](https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy) community container. So make sure that you do not enable both at the same time!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Pi-hole
|
## Pi-hole
|
||||||
This container bundles pi-hole and auto-configures it for you.
|
This container bundles the [pi-hole](https://pi-hole.net/) ad blocker and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- You should not run this container on a public VPS! It is only intended to run in home networks!
|
- You should not run this container on a public VPS! It is only intended to run in home networks!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Plex
|
## Plex
|
||||||
This container bundles Plex and auto-configures it for you.
|
This container bundles the [Plex Media Server](https://www.plex.tv/en-gb/personal-media-server/) and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container is incompatible with the [Jellyfin](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin) community container. So make sure that you do not enable both at the same time!
|
- This container is incompatible with the [Jellyfin](https://github.com/nextcloud/all-in-one/tree/main/community-containers/jellyfin) community container. So make sure that you do not enable both at the same time!
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Scrutiny
|
## Scrutiny
|
||||||
This container bundles Scrutiny which is a frontend for SMART stats and auto-configures it for you.
|
This container bundles [Scrutiny](https://github.com/analogj/scrutiny), a web frontend for SMART stats, and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- This container should only be run in home networks
|
- This container should only be run in home networks
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
> Do not use this feature as a main mail server or without a redundancy system and without knowledge.
|
> Do not use this feature as a main mail server or without a redundancy system and without knowledge.
|
||||||
|
|
||||||
## Stalwart mail server
|
## Stalwart mail server
|
||||||
This container bundles stalwart mail server and auto-configures it for you.
|
This container bundles the [Stalwart](https://stalw.art/) mail server and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
Documentation is available on the container repository.
|
Documentation is available on the container repository.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
## Vaultwarden
|
## Vaultwarden
|
||||||
This container bundles vaultwarden and auto-configures it for you.
|
This container bundles the [VaultWarden](https://www.vaultwarden.net/) password manager and auto-configures it for you.
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
- You need to configure a reverse proxy in order to run this container since vaultwarden needs a dedicated (sub)domain! For that, you might have a look at https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy or follow https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md and https://github.com/dani-garcia/vaultwarden/wiki/Proxy-examples. You need to point the reverse proxy at port 8812 of this server.
|
- You need to configure a reverse proxy in order to run this container since vaultwarden needs a dedicated (sub)domain! For that, you might have a look at https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy or follow https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md and https://github.com/dani-garcia/vaultwarden/wiki/Proxy-examples. You need to point the reverse proxy at port 8812 of this server.
|
||||||
|
|||||||
+2
-2
@@ -27,7 +27,7 @@ The only way to fix this on your side is upgrading regularly (e.g. by enabling d
|
|||||||
```bash
|
```bash
|
||||||
sudo docker pull assaflavie/runlike
|
sudo docker pull assaflavie/runlike
|
||||||
echo '#!/bin/bash' > /tmp/nextcloud-aio-nextcloud
|
echo '#!/bin/bash' > /tmp/nextcloud-aio-nextcloud
|
||||||
sudo docker run --rm -v /var/run/docker.sock:/var/run/docker.sock assaflavie/runlike -p nextcloud-aio-nextcloud >> /tmp/nextcloud-aio-nextcloud
|
sudo docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro assaflavie/runlike -p nextcloud-aio-nextcloud >> /tmp/nextcloud-aio-nextcloud
|
||||||
sudo chown root:root /tmp/nextcloud-aio-nextcloud
|
sudo chown root:root /tmp/nextcloud-aio-nextcloud
|
||||||
```
|
```
|
||||||
5. Now open `/tmp/nextcloud-aio-nextcloud` with a text editor, and edit the container tag:
|
5. Now open `/tmp/nextcloud-aio-nextcloud` with a text editor, and edit the container tag:
|
||||||
@@ -66,7 +66,7 @@ Prerequisite: have all containers from AIO interface running.
|
|||||||
##### 1. Install portainer if not installed:
|
##### 1. Install portainer if not installed:
|
||||||
```bash
|
```bash
|
||||||
docker volume create portainer_data
|
docker volume create portainer_data
|
||||||
docker run -d -p 8000:8000 -p 9443:9443 --name portainer --restart=always -v /var/run/docker.sock:/var/run/docker.sock -v portainer_data:/data portainer/portainer-ce:latest
|
docker run -d -p 8000:8000 -p 9443:9443 --name portainer --restart=always -v /var/run/docker.sock:/var/run/docker.sock:ro -v portainer_data:/data portainer/portainer-ce:latest
|
||||||
```
|
```
|
||||||
- If you have a reverse proxy
|
- If you have a reverse proxy
|
||||||
- you can setup and navigate using a domain name.
|
- you can setup and navigate using a domain name.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
name: nextcloud-aio-helm-chart
|
name: nextcloud-aio-helm-chart
|
||||||
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
|
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
|
||||||
version: 13.0.4
|
version: 13.1.0
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
keywords:
|
keywords:
|
||||||
- latest
|
- latest
|
||||||
|
|||||||
@@ -49,8 +49,6 @@ spec:
|
|||||||
value: "{{ .Values.APACHE_PORT }}"
|
value: "{{ .Values.APACHE_PORT }}"
|
||||||
- name: COLLABORA_HOST
|
- name: COLLABORA_HOST
|
||||||
value: nextcloud-aio-collabora
|
value: nextcloud-aio-collabora
|
||||||
- name: HARP_HOST
|
|
||||||
value: nextcloud-aio-harp
|
|
||||||
- name: NC_DOMAIN
|
- name: NC_DOMAIN
|
||||||
value: "{{ .Values.NC_DOMAIN }}"
|
value: "{{ .Values.NC_DOMAIN }}"
|
||||||
- name: NEXTCLOUD_HOST
|
- name: NEXTCLOUD_HOST
|
||||||
@@ -65,7 +63,7 @@ spec:
|
|||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
- name: WHITEBOARD_HOST
|
- name: WHITEBOARD_HOST
|
||||||
value: nextcloud-aio-whiteboard
|
value: nextcloud-aio-whiteboard
|
||||||
image: ghcr.io/nextcloud-releases/aio-apache:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-apache:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: init-subpath
|
- name: init-subpath
|
||||||
image: ghcr.io/nextcloud-releases/aio-alpine:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-alpine:20260527_140826
|
||||||
command:
|
command:
|
||||||
- mkdir
|
- mkdir
|
||||||
- "-p"
|
- "-p"
|
||||||
@@ -61,7 +61,7 @@ spec:
|
|||||||
value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}"
|
value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}"
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-clamav:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-clamav:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -38,9 +38,9 @@ spec:
|
|||||||
- name: server_name
|
- name: server_name
|
||||||
value: "{{ .Values.NC_DOMAIN }}"
|
value: "{{ .Values.NC_DOMAIN }}"
|
||||||
{{- if contains "--o:support_key=" (join " " (.Values.ADDITIONAL_COLLABORA_OPTIONS | default list)) }}
|
{{- if contains "--o:support_key=" (join " " (.Values.ADDITIONAL_COLLABORA_OPTIONS | default list)) }}
|
||||||
image: ghcr.io/nextcloud-releases/aio-collabora-online:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-collabora-online:20260527_140826
|
||||||
{{- else }}
|
{{- else }}
|
||||||
image: ghcr.io/nextcloud-releases/aio-collabora:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-collabora:20260527_140826
|
||||||
{{- end }}
|
{{- end }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: init-subpath
|
- name: init-subpath
|
||||||
image: ghcr.io/nextcloud-releases/aio-alpine:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-alpine:20260527_140826
|
||||||
command:
|
command:
|
||||||
- mkdir
|
- mkdir
|
||||||
- "-p"
|
- "-p"
|
||||||
@@ -66,7 +66,7 @@ spec:
|
|||||||
value: nextcloud
|
value: nextcloud
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-postgresql:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-postgresql:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: init-volumes
|
- name: init-volumes
|
||||||
image: ghcr.io/nextcloud-releases/aio-alpine:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-alpine:20260527_140826
|
||||||
command:
|
command:
|
||||||
- chmod
|
- chmod
|
||||||
- "777"
|
- "777"
|
||||||
@@ -60,7 +60,7 @@ spec:
|
|||||||
value: basic
|
value: basic
|
||||||
- name: xpack.security.enabled
|
- name: xpack.security.enabled
|
||||||
value: "false"
|
value: "false"
|
||||||
image: ghcr.io/nextcloud-releases/aio-fulltextsearch:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-fulltextsearch:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ spec:
|
|||||||
value: "{{ .Values.IMAGINARY_SECRET }}"
|
value: "{{ .Values.IMAGINARY_SECRET }}"
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-imaginary:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-imaginary:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ spec:
|
|||||||
# AIO settings start # Do not remove or change this line!
|
# AIO settings start # Do not remove or change this line!
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: init-volumes
|
- name: init-volumes
|
||||||
image: ghcr.io/nextcloud-releases/aio-alpine:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-alpine:20260527_140826
|
||||||
command:
|
command:
|
||||||
- chmod
|
- chmod
|
||||||
- "777"
|
- "777"
|
||||||
@@ -192,7 +192,7 @@ spec:
|
|||||||
value: "{{ .Values.WHITEBOARD_ENABLED }}"
|
value: "{{ .Values.WHITEBOARD_ENABLED }}"
|
||||||
- name: WHITEBOARD_SECRET
|
- name: WHITEBOARD_SECRET
|
||||||
value: "{{ .Values.WHITEBOARD_SECRET }}"
|
value: "{{ .Values.WHITEBOARD_SECRET }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-nextcloud:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-nextcloud:20260527_140826
|
||||||
{{- if eq (.Values.RPSS_ENABLED | default "no") "yes" }} # AIO-config - do not change this comment!
|
{{- if eq (.Values.RPSS_ENABLED | default "no") "yes" }} # AIO-config - do not change this comment!
|
||||||
securityContext:
|
securityContext:
|
||||||
# The items below only work in container context
|
# The items below only work in container context
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ spec:
|
|||||||
value: nextcloud-aio-nextcloud
|
value: nextcloud-aio-nextcloud
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-notify-push:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-notify-push:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: init-volumes
|
- name: init-volumes
|
||||||
image: ghcr.io/nextcloud-releases/aio-alpine:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-alpine:20260527_140826
|
||||||
command:
|
command:
|
||||||
- chmod
|
- chmod
|
||||||
- "777"
|
- "777"
|
||||||
@@ -46,7 +46,7 @@ spec:
|
|||||||
value: "{{ .Values.AIO_LOG_LEVEL }}"
|
value: "{{ .Values.AIO_LOG_LEVEL }}"
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-onlyoffice:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-onlyoffice:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ spec:
|
|||||||
value: "{{ .Values.REDIS_PASSWORD }}"
|
value: "{{ .Values.REDIS_PASSWORD }}"
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-redis:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-redis:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ spec:
|
|||||||
value: "{{ .Values.TURN_SECRET }}"
|
value: "{{ .Values.TURN_SECRET }}"
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-talk:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-talk:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ spec:
|
|||||||
value: "{{ .Values.RECORDING_SECRET }}"
|
value: "{{ .Values.RECORDING_SECRET }}"
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-talk-recording:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-talk-recording:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ spec:
|
|||||||
value: redis
|
value: redis
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "{{ .Values.TIMEZONE }}"
|
value: "{{ .Values.TIMEZONE }}"
|
||||||
image: ghcr.io/nextcloud-releases/aio-whiteboard:20260515_145717
|
image: ghcr.io/nextcloud-releases/aio-whiteboard:20260527_140826
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
exec:
|
exec:
|
||||||
command:
|
command:
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ for variable in "${DEPLOYMENTS[@]}"; do
|
|||||||
sed -i "/^ spec:/r /tmp/initcontainers.clamav" "$variable"
|
sed -i "/^ spec:/r /tmp/initcontainers.clamav" "$variable"
|
||||||
elif echo "$variable" | grep -q "nextcloud-deployment.yaml"; then
|
elif echo "$variable" | grep -q "nextcloud-deployment.yaml"; then
|
||||||
sed -i "/^ spec:/r /tmp/initcontainers.nextcloud" "$variable"
|
sed -i "/^ spec:/r /tmp/initcontainers.nextcloud" "$variable"
|
||||||
elif echo "$variable" | grep -q "fulltextsearch" || echo "$variable" | grep -q "onlyoffice" || echo "$variable" | grep -q "collabora"; then
|
elif echo "$variable" | grep -q "fulltextsearch" || echo "$variable" | grep -q "onlyoffice" || echo "$variable" | grep -q "eurooffice" || echo "$variable" | grep -q "collabora"; then
|
||||||
sed -i "/^ spec:/r /tmp/initcontainers" "$variable"
|
sed -i "/^ spec:/r /tmp/initcontainers" "$variable"
|
||||||
fi
|
fi
|
||||||
volumeNames="$(grep -A1 mountPath "$variable" | grep -v mountPath | sed 's|.*name: ||' | sed '/^--$/d')"
|
volumeNames="$(grep -A1 mountPath "$variable" | grep -v mountPath | sed 's|.*name: ||' | sed '/^--$/d')"
|
||||||
@@ -499,7 +499,7 @@ cat << EOL > /tmp/security.conf
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
EOL
|
EOL
|
||||||
# shellcheck disable=SC1083
|
# shellcheck disable=SC1083
|
||||||
find ./ \( -not -name '*collabora-deployment.yaml*' -not -name '*apache-deployment.yaml*' -not -name '*onlyoffice-deployment.yaml*' -name "*deployment.yaml" \) -exec sed -i "/^ securityContext:$/r /tmp/security.conf" \{} \;
|
find ./ \( -not -name '*collabora-deployment.yaml*' -not -name '*apache-deployment.yaml*' -not -name '*onlyoffice-deployment.yaml*' -not -name '*eurooffice-deployment.yaml*' -name "*deployment.yaml" \) -exec sed -i "/^ securityContext:$/r /tmp/security.conf" \{} \;
|
||||||
|
|
||||||
# shellcheck disable=SC1083
|
# shellcheck disable=SC1083
|
||||||
find ./ -name '*collabora-deployment.yaml*' -exec sed -i "/ADDITIONAL_COLLABORA_OPTIONS_PLACEHOLDER/d" \{} \;
|
find ./ -name '*collabora-deployment.yaml*' -exec sed -i "/ADDITIONAL_COLLABORA_OPTIONS_PLACEHOLDER/d" \{} \;
|
||||||
|
|||||||
Generated
+195
-101
@@ -64,25 +64,26 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/guzzle",
|
"name": "guzzlehttp/guzzle",
|
||||||
"version": "7.10.0",
|
"version": "7.11.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/guzzle.git",
|
"url": "https://github.com/guzzle/guzzle.git",
|
||||||
"reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
|
"reference": "c987f8ce84b8434fa430795eca0f3430663da72b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
|
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/c987f8ce84b8434fa430795eca0f3430663da72b",
|
||||||
"reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
|
"reference": "c987f8ce84b8434fa430795eca0f3430663da72b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"guzzlehttp/promises": "^2.3",
|
"guzzlehttp/promises": "^2.5",
|
||||||
"guzzlehttp/psr7": "^2.8",
|
"guzzlehttp/psr7": "^2.11",
|
||||||
"php": "^7.2.5 || ^8.0",
|
"php": "^7.2.5 || ^8.0",
|
||||||
"psr/http-client": "^1.0",
|
"psr/http-client": "^1.0",
|
||||||
"symfony/deprecation-contracts": "^2.2 || ^3.0"
|
"symfony/deprecation-contracts": "^2.5 || ^3.0",
|
||||||
|
"symfony/polyfill-php80": "^1.24"
|
||||||
},
|
},
|
||||||
"provide": {
|
"provide": {
|
||||||
"psr/http-client-implementation": "1.0"
|
"psr/http-client-implementation": "1.0"
|
||||||
@@ -91,8 +92,9 @@
|
|||||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
"guzzle/client-integration-tests": "3.0.2",
|
"guzzle/client-integration-tests": "3.0.2",
|
||||||
|
"guzzlehttp/test-server": "^0.4",
|
||||||
"php-http/message-factory": "^1.1",
|
"php-http/message-factory": "^1.1",
|
||||||
"phpunit/phpunit": "^8.5.39 || ^9.6.20",
|
"phpunit/phpunit": "^8.5.52 || ^9.6.34",
|
||||||
"psr/log": "^1.1 || ^2.0 || ^3.0"
|
"psr/log": "^1.1 || ^2.0 || ^3.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
@@ -170,7 +172,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/guzzle/guzzle/issues",
|
"issues": "https://github.com/guzzle/guzzle/issues",
|
||||||
"source": "https://github.com/guzzle/guzzle/tree/7.10.0"
|
"source": "https://github.com/guzzle/guzzle/tree/7.11.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -186,28 +188,29 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2025-08-23T22:36:01+00:00"
|
"time": "2026-06-02T12:40:51+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/promises",
|
"name": "guzzlehttp/promises",
|
||||||
"version": "2.3.0",
|
"version": "2.5.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/promises.git",
|
"url": "https://github.com/guzzle/promises.git",
|
||||||
"reference": "481557b130ef3790cf82b713667b43030dc9c957"
|
"reference": "4360e982f87f5f258bf872d094647791db2f4c8e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
|
"url": "https://api.github.com/repos/guzzle/promises/zipball/4360e982f87f5f258bf872d094647791db2f4c8e",
|
||||||
"reference": "481557b130ef3790cf82b713667b43030dc9c957",
|
"reference": "4360e982f87f5f258bf872d094647791db2f4c8e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.2.5 || ^8.0"
|
"php": "^7.2.5 || ^8.0",
|
||||||
|
"symfony/deprecation-contracts": "^2.5 || ^3.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||||
"phpunit/phpunit": "^8.5.44 || ^9.6.25"
|
"phpunit/phpunit": "^8.5.52 || ^9.6.34"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
@@ -253,7 +256,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/guzzle/promises/issues",
|
"issues": "https://github.com/guzzle/promises/issues",
|
||||||
"source": "https://github.com/guzzle/promises/tree/2.3.0"
|
"source": "https://github.com/guzzle/promises/tree/2.5.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -269,27 +272,29 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2025-08-22T14:34:08+00:00"
|
"time": "2026-06-02T12:23:43+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/psr7",
|
"name": "guzzlehttp/psr7",
|
||||||
"version": "2.9.0",
|
"version": "2.11.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/psr7.git",
|
"url": "https://github.com/guzzle/psr7.git",
|
||||||
"reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884"
|
"reference": "bbb5e61349fa5cb822b3e87842b951088b76b81f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884",
|
"url": "https://api.github.com/repos/guzzle/psr7/zipball/bbb5e61349fa5cb822b3e87842b951088b76b81f",
|
||||||
"reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884",
|
"reference": "bbb5e61349fa5cb822b3e87842b951088b76b81f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.2.5 || ^8.0",
|
"php": "^7.2.5 || ^8.0",
|
||||||
"psr/http-factory": "^1.0",
|
"psr/http-factory": "^1.0",
|
||||||
"psr/http-message": "^1.1 || ^2.0",
|
"psr/http-message": "^1.1 || ^2.0",
|
||||||
"ralouphie/getallheaders": "^3.0"
|
"ralouphie/getallheaders": "^3.0",
|
||||||
|
"symfony/deprecation-contracts": "^2.5 || ^3.0",
|
||||||
|
"symfony/polyfill-php80": "^1.24"
|
||||||
},
|
},
|
||||||
"provide": {
|
"provide": {
|
||||||
"psr/http-factory-implementation": "1.0",
|
"psr/http-factory-implementation": "1.0",
|
||||||
@@ -297,9 +302,9 @@
|
|||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"bamarni/composer-bin-plugin": "^1.8.2",
|
"bamarni/composer-bin-plugin": "^1.8.2",
|
||||||
"http-interop/http-factory-tests": "0.9.0",
|
"http-interop/http-factory-tests": "1.1.0",
|
||||||
"jshttp/mime-db": "1.54.0.1",
|
"jshttp/mime-db": "1.54.0.1",
|
||||||
"phpunit/phpunit": "^8.5.44 || ^9.6.25"
|
"phpunit/phpunit": "^8.5.52 || ^9.6.34"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
|
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
|
||||||
@@ -370,7 +375,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/guzzle/psr7/issues",
|
"issues": "https://github.com/guzzle/psr7/issues",
|
||||||
"source": "https://github.com/guzzle/psr7/tree/2.9.0"
|
"source": "https://github.com/guzzle/psr7/tree/2.11.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -386,7 +391,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-03-10T16:41:02+00:00"
|
"time": "2026-06-02T12:30:48+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "http-interop/http-factory-guzzle",
|
"name": "http-interop/http-factory-guzzle",
|
||||||
@@ -1284,16 +1289,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "slim/slim",
|
"name": "slim/slim",
|
||||||
"version": "4.15.1",
|
"version": "4.15.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/slimphp/Slim.git",
|
"url": "https://github.com/slimphp/Slim.git",
|
||||||
"reference": "887893516557506f254d950425ce7f5387a26970"
|
"reference": "e12cb05ca2a14e8f459d019e87a31dc915b80470"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/slimphp/Slim/zipball/887893516557506f254d950425ce7f5387a26970",
|
"url": "https://api.github.com/repos/slimphp/Slim/zipball/e12cb05ca2a14e8f459d019e87a31dc915b80470",
|
||||||
"reference": "887893516557506f254d950425ce7f5387a26970",
|
"reference": "e12cb05ca2a14e8f459d019e87a31dc915b80470",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1396,7 +1401,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2025-11-21T12:23:44+00:00"
|
"time": "2026-05-22T08:00:12+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "slim/twig-view",
|
"name": "slim/twig-view",
|
||||||
@@ -1619,16 +1624,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.37.0",
|
"version": "v1.38.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
|
"reference": "14c5439eec4ccff081ac14eca2dc57feb2a66d92"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/14c5439eec4ccff081ac14eca2dc57feb2a66d92",
|
||||||
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
|
"reference": "14c5439eec4ccff081ac14eca2dc57feb2a66d92",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1680,7 +1685,7 @@
|
|||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
|
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1700,20 +1705,104 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-04-10T17:25:58+00:00"
|
"time": "2026-05-26T12:51:13+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php81",
|
"name": "symfony/polyfill-php80",
|
||||||
"version": "v1.37.0",
|
"version": "v1.37.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php81.git",
|
"url": "https://github.com/symfony/polyfill-php80.git",
|
||||||
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
|
"reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
|
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
|
||||||
"reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
|
"reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=7.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"thanks": {
|
||||||
|
"url": "https://github.com/symfony/polyfill",
|
||||||
|
"name": "symfony/polyfill"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"files": [
|
||||||
|
"bootstrap.php"
|
||||||
|
],
|
||||||
|
"psr-4": {
|
||||||
|
"Symfony\\Polyfill\\Php80\\": ""
|
||||||
|
},
|
||||||
|
"classmap": [
|
||||||
|
"Resources/stubs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Ion Bazan",
|
||||||
|
"email": "ion.bazan@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Nicolas Grekas",
|
||||||
|
"email": "p@tchwork.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Symfony Community",
|
||||||
|
"homepage": "https://symfony.com/contributors"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
|
||||||
|
"homepage": "https://symfony.com",
|
||||||
|
"keywords": [
|
||||||
|
"compatibility",
|
||||||
|
"polyfill",
|
||||||
|
"portable",
|
||||||
|
"shim"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://symfony.com/sponsor",
|
||||||
|
"type": "custom"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/fabpot",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/nicolas-grekas",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
|
||||||
|
"type": "tidelift"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2026-04-10T16:19:22+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "symfony/polyfill-php81",
|
||||||
|
"version": "v1.38.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/symfony/polyfill-php81.git",
|
||||||
|
"reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
|
||||||
|
"reference": "6bfb9c766cacffbc8e118cb87217d08ed84e5cd7",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1760,7 +1849,7 @@
|
|||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-php81/tree/v1.37.0"
|
"source": "https://github.com/symfony/polyfill-php81/tree/v1.38.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1780,20 +1869,20 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-09-09T11:45:10+00:00"
|
"time": "2026-05-26T12:45:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "twig/twig",
|
"name": "twig/twig",
|
||||||
"version": "v3.25.0",
|
"version": "v3.27.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/twigphp/Twig.git",
|
"url": "https://github.com/twigphp/Twig.git",
|
||||||
"reference": "0dade995be754556af4dcbf8721d45cb3271f9b4"
|
"reference": "ae2071bffb38f04847fc0864d730c94b9cb8ab74"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/0dade995be754556af4dcbf8721d45cb3271f9b4",
|
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ae2071bffb38f04847fc0864d730c94b9cb8ab74",
|
||||||
"reference": "0dade995be754556af4dcbf8721d45cb3271f9b4",
|
"reference": "ae2071bffb38f04847fc0864d730c94b9cb8ab74",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1848,7 +1937,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/twigphp/Twig/issues",
|
"issues": "https://github.com/twigphp/Twig/issues",
|
||||||
"source": "https://github.com/twigphp/Twig/tree/v3.25.0"
|
"source": "https://github.com/twigphp/Twig/tree/v3.27.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1860,7 +1949,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-05-17T07:41:26+00:00"
|
"time": "2026-05-30T17:09:26+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
@@ -2389,16 +2478,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/process",
|
"name": "amphp/process",
|
||||||
"version": "v2.0.3",
|
"version": "v2.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/amphp/process.git",
|
"url": "https://github.com/amphp/process.git",
|
||||||
"reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d"
|
"reference": "583959df17d00304ad7b0b32285373f985935643"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/amphp/process/zipball/52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
|
"url": "https://api.github.com/repos/amphp/process/zipball/583959df17d00304ad7b0b32285373f985935643",
|
||||||
"reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
|
"reference": "583959df17d00304ad7b0b32285373f985935643",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -2412,7 +2501,7 @@
|
|||||||
"amphp/php-cs-fixer-config": "^2",
|
"amphp/php-cs-fixer-config": "^2",
|
||||||
"amphp/phpunit-util": "^3",
|
"amphp/phpunit-util": "^3",
|
||||||
"phpunit/phpunit": "^9",
|
"phpunit/phpunit": "^9",
|
||||||
"psalm/phar": "^5.4"
|
"psalm/phar": "6.16.1"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@@ -2445,7 +2534,7 @@
|
|||||||
"homepage": "https://amphp.org/process",
|
"homepage": "https://amphp.org/process",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/amphp/process/issues",
|
"issues": "https://github.com/amphp/process/issues",
|
||||||
"source": "https://github.com/amphp/process/tree/v2.0.3"
|
"source": "https://github.com/amphp/process/tree/v2.1.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -2453,7 +2542,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-04-19T03:13:44+00:00"
|
"time": "2026-05-31T15:11:55+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "amphp/serialization",
|
"name": "amphp/serialization",
|
||||||
@@ -4052,16 +4141,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/console",
|
"name": "symfony/console",
|
||||||
"version": "v6.4.39",
|
"version": "v6.4.41",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/console.git",
|
"url": "https://github.com/symfony/console.git",
|
||||||
"reference": "c132f1215fe4aa45b70173cc00ce9a755dd31ec5"
|
"reference": "d21b17ed158e79180fac3895ff751707970eeb57"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/console/zipball/c132f1215fe4aa45b70173cc00ce9a755dd31ec5",
|
"url": "https://api.github.com/repos/symfony/console/zipball/d21b17ed158e79180fac3895ff751707970eeb57",
|
||||||
"reference": "c132f1215fe4aa45b70173cc00ce9a755dd31ec5",
|
"reference": "d21b17ed158e79180fac3895ff751707970eeb57",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4126,7 +4215,7 @@
|
|||||||
"terminal"
|
"terminal"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/console/tree/v6.4.39"
|
"source": "https://github.com/symfony/console/tree/v6.4.41"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -4146,24 +4235,25 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-05-12T06:50:03+00:00"
|
"time": "2026-05-24T08:48:41+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/filesystem",
|
"name": "symfony/filesystem",
|
||||||
"version": "v8.0.11",
|
"version": "v8.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/filesystem.git",
|
"url": "https://github.com/symfony/filesystem.git",
|
||||||
"reference": "224db910898ce1317b892a9a1338f1f8f17eb7c7"
|
"reference": "99aec13b82b4967ec5088222c4a3ecca955949c2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/filesystem/zipball/224db910898ce1317b892a9a1338f1f8f17eb7c7",
|
"url": "https://api.github.com/repos/symfony/filesystem/zipball/99aec13b82b4967ec5088222c4a3ecca955949c2",
|
||||||
"reference": "224db910898ce1317b892a9a1338f1f8f17eb7c7",
|
"reference": "99aec13b82b4967ec5088222c4a3ecca955949c2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.4",
|
"php": ">=8.4.1",
|
||||||
|
"symfony/deprecation-contracts": "^2.5|^3",
|
||||||
"symfony/polyfill-ctype": "~1.8",
|
"symfony/polyfill-ctype": "~1.8",
|
||||||
"symfony/polyfill-mbstring": "~1.8"
|
"symfony/polyfill-mbstring": "~1.8"
|
||||||
},
|
},
|
||||||
@@ -4196,7 +4286,7 @@
|
|||||||
"description": "Provides basic utilities for the filesystem",
|
"description": "Provides basic utilities for the filesystem",
|
||||||
"homepage": "https://symfony.com",
|
"homepage": "https://symfony.com",
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/filesystem/tree/v8.0.11"
|
"source": "https://github.com/symfony/filesystem/tree/v8.1.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -4216,7 +4306,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-05-11T16:39:47+00:00"
|
"time": "2026-05-29T05:06:50+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/finder",
|
"name": "symfony/finder",
|
||||||
@@ -4288,16 +4378,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-grapheme",
|
"name": "symfony/polyfill-intl-grapheme",
|
||||||
"version": "v1.37.0",
|
"version": "v1.38.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
||||||
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e"
|
"reference": "e9247d281d694a5120554d9afaf54e070e88a603"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e9247d281d694a5120554d9afaf54e070e88a603",
|
||||||
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e",
|
"reference": "e9247d281d694a5120554d9afaf54e070e88a603",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4346,7 +4436,7 @@
|
|||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0"
|
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.38.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -4366,20 +4456,20 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-04-26T13:13:48+00:00"
|
"time": "2026-05-26T05:58:03+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-normalizer",
|
"name": "symfony/polyfill-intl-normalizer",
|
||||||
"version": "v1.37.0",
|
"version": "v1.38.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
||||||
"reference": "3833d7255cc303546435cb650316bff708a1c75c"
|
"reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
|
||||||
"reference": "3833d7255cc303546435cb650316bff708a1c75c",
|
"reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4431,7 +4521,7 @@
|
|||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0"
|
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -4451,20 +4541,20 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-09-09T11:45:10+00:00"
|
"time": "2026-05-25T13:48:31+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php84",
|
"name": "symfony/polyfill-php84",
|
||||||
"version": "v1.37.0",
|
"version": "v1.38.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php84.git",
|
"url": "https://github.com/symfony/polyfill-php84.git",
|
||||||
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06"
|
"reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06",
|
"url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
|
||||||
"reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06",
|
"reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4511,7 +4601,7 @@
|
|||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-php84/tree/v1.37.0"
|
"source": "https://github.com/symfony/polyfill-php84/tree/v1.38.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -4531,7 +4621,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-04-10T18:47:49+00:00"
|
"time": "2026-05-26T12:51:13+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/service-contracts",
|
"name": "symfony/service-contracts",
|
||||||
@@ -4622,16 +4712,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/string",
|
"name": "symfony/string",
|
||||||
"version": "v7.4.11",
|
"version": "v7.4.13",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/string.git",
|
"url": "https://github.com/symfony/string.git",
|
||||||
"reference": "965f7306a43383d02c6aca1e3f3bd2f0ea5dee15"
|
"reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/string/zipball/965f7306a43383d02c6aca1e3f3bd2f0ea5dee15",
|
"url": "https://api.github.com/repos/symfony/string/zipball/961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
|
||||||
"reference": "965f7306a43383d02c6aca1e3f3bd2f0ea5dee15",
|
"reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4689,7 +4779,7 @@
|
|||||||
"utf8"
|
"utf8"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/string/tree/v7.4.11"
|
"source": "https://github.com/symfony/string/tree/v7.4.13"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -4709,7 +4799,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-05-13T12:04:42+00:00"
|
"time": "2026-05-23T15:23:29+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "vimeo/psalm",
|
"name": "vimeo/psalm",
|
||||||
@@ -4898,16 +4988,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "webmozart/assert",
|
"name": "webmozart/assert",
|
||||||
"version": "2.3.0",
|
"version": "2.4.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/webmozarts/assert.git",
|
"url": "https://github.com/webmozarts/assert.git",
|
||||||
"reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4"
|
"reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/webmozarts/assert/zipball/eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
|
"url": "https://api.github.com/repos/webmozarts/assert/zipball/9007ea6f45ecf352a9422b36644e4bfc039b9155",
|
||||||
"reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4",
|
"reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4923,7 +5013,11 @@
|
|||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
|
"psalm": {
|
||||||
|
"pluginClass": "Webmozart\\Assert\\PsalmPlugin"
|
||||||
|
},
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
|
"dev-master": "2.0-dev",
|
||||||
"dev-feature/2-0": "2.0-dev"
|
"dev-feature/2-0": "2.0-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -4954,9 +5048,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/webmozarts/assert/issues",
|
"issues": "https://github.com/webmozarts/assert/issues",
|
||||||
"source": "https://github.com/webmozarts/assert/tree/2.3.0"
|
"source": "https://github.com/webmozarts/assert/tree/2.4.0"
|
||||||
},
|
},
|
||||||
"time": "2026-04-11T10:33:05+00:00"
|
"time": "2026-05-20T13:07:01+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
|
|||||||
+54
-2
@@ -6,6 +6,7 @@
|
|||||||
"documentation": "https://github.com/nextcloud/all-in-one/discussions/2105",
|
"documentation": "https://github.com/nextcloud/all-in-one/discussions/2105",
|
||||||
"depends_on": [
|
"depends_on": [
|
||||||
"nextcloud-aio-onlyoffice",
|
"nextcloud-aio-onlyoffice",
|
||||||
|
"nextcloud-aio-eurooffice",
|
||||||
"nextcloud-aio-collabora",
|
"nextcloud-aio-collabora",
|
||||||
"nextcloud-aio-talk",
|
"nextcloud-aio-talk",
|
||||||
"nextcloud-aio-notify-push",
|
"nextcloud-aio-notify-push",
|
||||||
@@ -47,6 +48,7 @@
|
|||||||
"APACHE_PORT=%APACHE_PORT%",
|
"APACHE_PORT=%APACHE_PORT%",
|
||||||
"AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
|
"AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
|
||||||
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice",
|
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice",
|
||||||
|
"EUROOFFICE_HOST=nextcloud-aio-eurooffice",
|
||||||
"TZ=%TIMEZONE%",
|
"TZ=%TIMEZONE%",
|
||||||
"APACHE_MAX_SIZE=%APACHE_MAX_SIZE%",
|
"APACHE_MAX_SIZE=%APACHE_MAX_SIZE%",
|
||||||
"APACHE_MAX_TIME=%NEXTCLOUD_MAX_TIME%",
|
"APACHE_MAX_TIME=%NEXTCLOUD_MAX_TIME%",
|
||||||
@@ -223,6 +225,7 @@
|
|||||||
"TURN_SECRET=%TURN_SECRET%",
|
"TURN_SECRET=%TURN_SECRET%",
|
||||||
"SIGNALING_SECRET=%SIGNALING_SECRET%",
|
"SIGNALING_SECRET=%SIGNALING_SECRET%",
|
||||||
"ONLYOFFICE_SECRET=%ONLYOFFICE_SECRET%",
|
"ONLYOFFICE_SECRET=%ONLYOFFICE_SECRET%",
|
||||||
|
"EUROOFFICE_SECRET=%EUROOFFICE_SECRET%",
|
||||||
"AIO_URL=%AIO_URL%",
|
"AIO_URL=%AIO_URL%",
|
||||||
"AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
|
"AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
|
||||||
"NC_AIO_VERSION=v%AIO_VERSION%",
|
"NC_AIO_VERSION=v%AIO_VERSION%",
|
||||||
@@ -230,10 +233,12 @@
|
|||||||
"CLAMAV_ENABLED=%CLAMAV_ENABLED%",
|
"CLAMAV_ENABLED=%CLAMAV_ENABLED%",
|
||||||
"CLAMAV_HOST=nextcloud-aio-clamav",
|
"CLAMAV_HOST=nextcloud-aio-clamav",
|
||||||
"ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%",
|
"ONLYOFFICE_ENABLED=%ONLYOFFICE_ENABLED%",
|
||||||
|
"EUROOFFICE_ENABLED=%EUROOFFICE_ENABLED%",
|
||||||
"COLLABORA_ENABLED=%COLLABORA_ENABLED%",
|
"COLLABORA_ENABLED=%COLLABORA_ENABLED%",
|
||||||
"COLLABORA_HOST=nextcloud-aio-collabora",
|
"COLLABORA_HOST=nextcloud-aio-collabora",
|
||||||
"TALK_ENABLED=%TALK_ENABLED%",
|
"TALK_ENABLED=%TALK_ENABLED%",
|
||||||
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice",
|
"ONLYOFFICE_HOST=nextcloud-aio-onlyoffice",
|
||||||
|
"EUROOFFICE_HOST=nextcloud-aio-eurooffice",
|
||||||
"UPDATE_NEXTCLOUD_APPS=%UPDATE_NEXTCLOUD_APPS%",
|
"UPDATE_NEXTCLOUD_APPS=%UPDATE_NEXTCLOUD_APPS%",
|
||||||
"TZ=%TIMEZONE%",
|
"TZ=%TIMEZONE%",
|
||||||
"TALK_PORT=%TALK_PORT%",
|
"TALK_PORT=%TALK_PORT%",
|
||||||
@@ -357,6 +362,7 @@
|
|||||||
"secrets": [
|
"secrets": [
|
||||||
"REDIS_PASSWORD",
|
"REDIS_PASSWORD",
|
||||||
"ONLYOFFICE_SECRET",
|
"ONLYOFFICE_SECRET",
|
||||||
|
"EUROOFFICE_SECRET",
|
||||||
"RECORDING_SECRET"
|
"RECORDING_SECRET"
|
||||||
],
|
],
|
||||||
"restart": "unless-stopped",
|
"restart": "unless-stopped",
|
||||||
@@ -758,6 +764,50 @@
|
|||||||
"NET_RAW"
|
"NET_RAW"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"container_name": "nextcloud-aio-eurooffice",
|
||||||
|
"image_tag": "%AIO_CHANNEL%",
|
||||||
|
"display_name": "EuroOffice",
|
||||||
|
"image": "ghcr.io/nextcloud-releases/aio-eurooffice",
|
||||||
|
"init": true,
|
||||||
|
"healthcheck": {
|
||||||
|
"start_period": "60s",
|
||||||
|
"test": "/healthcheck.sh",
|
||||||
|
"interval": "30s",
|
||||||
|
"timeout": "30s",
|
||||||
|
"start_interval": "5s",
|
||||||
|
"retries": 9
|
||||||
|
},
|
||||||
|
"expose": [
|
||||||
|
"80"
|
||||||
|
],
|
||||||
|
"internal_port": "80",
|
||||||
|
"environment": [
|
||||||
|
"AIO_LOG_LEVEL=%AIO_LOG_LEVEL%",
|
||||||
|
"LOG_LEVEL=%AIO_LOG_LEVEL%",
|
||||||
|
"TZ=%TIMEZONE%",
|
||||||
|
"JWT_ENABLED=true",
|
||||||
|
"JWT_HEADER=AuthorizationJwt",
|
||||||
|
"JWT_SECRET=%EUROOFFICE_SECRET%"
|
||||||
|
],
|
||||||
|
"volumes": [
|
||||||
|
{
|
||||||
|
"source": "nextcloud_aio_eurooffice",
|
||||||
|
"destination": "/var/lib/euro-office",
|
||||||
|
"writeable": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"secrets": [
|
||||||
|
"EUROOFFICE_SECRET"
|
||||||
|
],
|
||||||
|
"restart": "unless-stopped",
|
||||||
|
"profiles": [
|
||||||
|
"eurooffice"
|
||||||
|
],
|
||||||
|
"cap_drop": [
|
||||||
|
"NET_RAW"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"container_name": "nextcloud-aio-imaginary",
|
"container_name": "nextcloud-aio-imaginary",
|
||||||
"image_tag": "%AIO_CHANNEL%",
|
"image_tag": "%AIO_CHANNEL%",
|
||||||
@@ -828,11 +878,13 @@
|
|||||||
"discovery.type=single-node",
|
"discovery.type=single-node",
|
||||||
"http.port=9200",
|
"http.port=9200",
|
||||||
"xpack.license.self_generated.type=basic",
|
"xpack.license.self_generated.type=basic",
|
||||||
"xpack.security.enabled=false",
|
"xpack.security.enabled=true",
|
||||||
|
"xpack.security.http.ssl.enabled=false",
|
||||||
|
"xpack.security.transport.ssl.enabled=false",
|
||||||
"indices.fielddata.cache.size=20%",
|
"indices.fielddata.cache.size=20%",
|
||||||
"indices.memory.index_buffer_size=20%",
|
"indices.memory.index_buffer_size=20%",
|
||||||
"thread_pool.write.queue_size=1000",
|
"thread_pool.write.queue_size=1000",
|
||||||
"FULLTEXTSEARCH_PASSWORD=%FULLTEXTSEARCH_PASSWORD%"
|
"ELASTIC_PASSWORD=%FULLTEXTSEARCH_PASSWORD%"
|
||||||
],
|
],
|
||||||
"volumes": [
|
"volumes": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
"use strict";
|
||||||
|
|
||||||
|
// Apply the saved theme immediately to avoid a flash of the wrong theme.
|
||||||
|
try { document.documentElement.setAttribute('data-theme', localStorage.getItem('theme') ?? ''); } catch (e) {}
|
||||||
|
|
||||||
|
// React when the user toggles the theme on the parent page while this page is
|
||||||
|
// open in an iframe. localStorage.setItem() fires a 'storage' event on every
|
||||||
|
// other window / frame that shares the same origin, so we can keep in sync
|
||||||
|
// without the parent having to know about us.
|
||||||
|
window.addEventListener('storage', (e) => {
|
||||||
|
if (e.key === 'theme') {
|
||||||
|
document.documentElement.setAttribute('data-theme', e.newValue ?? '');
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -22,9 +22,11 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
// Office suite radio buttons
|
// Office suite radio buttons
|
||||||
const collaboraRadio = document.getElementById('office-collabora');
|
const collaboraRadio = document.getElementById('office-collabora');
|
||||||
const onlyofficeRadio = document.getElementById('office-onlyoffice');
|
const onlyofficeRadio = document.getElementById('office-onlyoffice');
|
||||||
|
const euroofficeRadio = document.getElementById('office-eurooffice');
|
||||||
const noneRadio = document.getElementById('office-none');
|
const noneRadio = document.getElementById('office-none');
|
||||||
const collaboraHidden = document.getElementById('collabora');
|
const collaboraHidden = document.getElementById('collabora');
|
||||||
const onlyofficeHidden = document.getElementById('onlyoffice');
|
const onlyofficeHidden = document.getElementById('onlyoffice');
|
||||||
|
const euroofficeHidden = document.getElementById('eurooffice');
|
||||||
let initialOfficeSelection = null;
|
let initialOfficeSelection = null;
|
||||||
|
|
||||||
optionsContainersCheckboxes.forEach(checkbox => {
|
optionsContainersCheckboxes.forEach(checkbox => {
|
||||||
@@ -36,11 +38,13 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Store initial office suite selection
|
// Store initial office suite selection
|
||||||
if (collaboraRadio && onlyofficeRadio && noneRadio) {
|
if (collaboraRadio && onlyofficeRadio && euroofficeRadio && noneRadio) {
|
||||||
if (collaboraRadio.checked) {
|
if (collaboraRadio.checked) {
|
||||||
initialOfficeSelection = 'collabora';
|
initialOfficeSelection = 'collabora';
|
||||||
} else if (onlyofficeRadio.checked) {
|
} else if (onlyofficeRadio.checked) {
|
||||||
initialOfficeSelection = 'onlyoffice';
|
initialOfficeSelection = 'onlyoffice';
|
||||||
|
} else if (euroofficeRadio.checked) {
|
||||||
|
initialOfficeSelection = 'eurooffice';
|
||||||
} else {
|
} else {
|
||||||
initialOfficeSelection = 'none';
|
initialOfficeSelection = 'none';
|
||||||
}
|
}
|
||||||
@@ -57,20 +61,28 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Check office suite changes and sync to hidden inputs
|
// Check office suite changes and sync to hidden inputs
|
||||||
if (collaboraRadio && onlyofficeRadio && noneRadio && collaboraHidden && onlyofficeHidden) {
|
if (collaboraRadio && onlyofficeRadio && euroofficeRadio && noneRadio && collaboraHidden && onlyofficeHidden && euroofficeHidden) {
|
||||||
let currentOfficeSelection = null;
|
let currentOfficeSelection = null;
|
||||||
if (collaboraRadio.checked) {
|
if (collaboraRadio.checked) {
|
||||||
currentOfficeSelection = 'collabora';
|
currentOfficeSelection = 'collabora';
|
||||||
collaboraHidden.value = 'on';
|
collaboraHidden.value = 'on';
|
||||||
onlyofficeHidden.value = '';
|
onlyofficeHidden.value = '';
|
||||||
|
euroofficeHidden.value = '';
|
||||||
} else if (onlyofficeRadio.checked) {
|
} else if (onlyofficeRadio.checked) {
|
||||||
currentOfficeSelection = 'onlyoffice';
|
currentOfficeSelection = 'onlyoffice';
|
||||||
collaboraHidden.value = '';
|
collaboraHidden.value = '';
|
||||||
onlyofficeHidden.value = 'on';
|
onlyofficeHidden.value = 'on';
|
||||||
|
euroofficeHidden.value = '';
|
||||||
|
} else if (euroofficeRadio.checked) {
|
||||||
|
currentOfficeSelection = 'eurooffice';
|
||||||
|
collaboraHidden.value = '';
|
||||||
|
onlyofficeHidden.value = '';
|
||||||
|
euroofficeHidden.value = 'on';
|
||||||
} else {
|
} else {
|
||||||
currentOfficeSelection = 'none';
|
currentOfficeSelection = 'none';
|
||||||
collaboraHidden.value = '';
|
collaboraHidden.value = '';
|
||||||
onlyofficeHidden.value = '';
|
onlyofficeHidden.value = '';
|
||||||
|
euroofficeHidden.value = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentOfficeSelection !== initialOfficeSelection) {
|
if (currentOfficeSelection !== initialOfficeSelection) {
|
||||||
@@ -144,9 +156,10 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
handleTalkVisibility(); // Ensure talk-recording is correctly initialized
|
handleTalkVisibility(); // Ensure talk-recording is correctly initialized
|
||||||
|
|
||||||
// Add event listeners for office suite radio buttons
|
// Add event listeners for office suite radio buttons
|
||||||
if (collaboraRadio && onlyofficeRadio && noneRadio) {
|
if (collaboraRadio && onlyofficeRadio && euroofficeRadio && noneRadio) {
|
||||||
collaboraRadio.addEventListener('change', checkForOptionContainerChanges);
|
collaboraRadio.addEventListener('change', checkForOptionContainerChanges);
|
||||||
onlyofficeRadio.addEventListener('change', checkForOptionContainerChanges);
|
onlyofficeRadio.addEventListener('change', checkForOptionContainerChanges);
|
||||||
|
euroofficeRadio.addEventListener('change', checkForOptionContainerChanges);
|
||||||
noneRadio.addEventListener('change', checkForOptionContainerChanges);
|
noneRadio.addEventListener('change', checkForOptionContainerChanges);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,12 @@ document.addEventListener("DOMContentLoaded", function(event) {
|
|||||||
const onlyoffice = document.getElementById("office-onlyoffice");
|
const onlyoffice = document.getElementById("office-onlyoffice");
|
||||||
onlyoffice.disabled = true;
|
onlyoffice.disabled = true;
|
||||||
|
|
||||||
|
// EuroOffice
|
||||||
|
const eurooffice = document.getElementById("office-eurooffice");
|
||||||
|
if (eurooffice) {
|
||||||
|
eurooffice.disabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Imaginary
|
// Imaginary
|
||||||
let imaginary = document.getElementById("imaginary");
|
let imaginary = document.getElementById("imaginary");
|
||||||
imaginary.disabled = true;
|
imaginary.disabled = true;
|
||||||
|
|||||||
+16
-3
@@ -104,6 +104,7 @@ $app->post('/api/docker/backup-test', AIO\Controller\DockerController::class . '
|
|||||||
$app->post('/api/docker/restore', AIO\Controller\DockerController::class . ':StartBackupContainerRestore');
|
$app->post('/api/docker/restore', AIO\Controller\DockerController::class . ':StartBackupContainerRestore');
|
||||||
$app->post('/api/docker/stop', AIO\Controller\DockerController::class . ':StopContainer');
|
$app->post('/api/docker/stop', AIO\Controller\DockerController::class . ':StopContainer');
|
||||||
$app->post('/api/docker/backup-reset-location', AIO\Controller\DockerController::class . ':DeleteBorgBackupConfig');
|
$app->post('/api/docker/backup-reset-location', AIO\Controller\DockerController::class . ':DeleteBorgBackupConfig');
|
||||||
|
$app->post('/api/docker/nextcloud-upgrade-to-latest-major', AIO\Controller\DockerController::class . ':RunNextcloudUpgradeToLatestMajor');
|
||||||
$app->post('/api/docker/prune', AIO\Controller\DockerController::class . ':SystemPrune');
|
$app->post('/api/docker/prune', AIO\Controller\DockerController::class . ':SystemPrune');
|
||||||
$app->get('/api/docker/logs', AIO\Controller\DockerController::class . ':GetLogs');
|
$app->get('/api/docker/logs', AIO\Controller\DockerController::class . ':GetLogs');
|
||||||
$app->post('/api/auth/login', AIO\Controller\LoginController::class . ':TryLogin');
|
$app->post('/api/auth/login', AIO\Controller\LoginController::class . ':TryLogin');
|
||||||
@@ -152,6 +153,7 @@ $app->get('/containers', function (Request $request, Response $response, array $
|
|||||||
'current_channel' => $dockerActionManager->GetCurrentChannel(),
|
'current_channel' => $dockerActionManager->GetCurrentChannel(),
|
||||||
'is_clamav_enabled' => $configurationManager->isClamavEnabled,
|
'is_clamav_enabled' => $configurationManager->isClamavEnabled,
|
||||||
'is_onlyoffice_enabled' => $configurationManager->isOnlyofficeEnabled,
|
'is_onlyoffice_enabled' => $configurationManager->isOnlyofficeEnabled,
|
||||||
|
'is_eurooffice_enabled' => $configurationManager->isEuroofficeEnabled,
|
||||||
'is_collabora_enabled' => $configurationManager->isCollaboraEnabled,
|
'is_collabora_enabled' => $configurationManager->isCollaboraEnabled,
|
||||||
'is_talk_enabled' => $configurationManager->isTalkEnabled,
|
'is_talk_enabled' => $configurationManager->isTalkEnabled,
|
||||||
'borg_restore_password' => $configurationManager->borgRestorePassword,
|
'borg_restore_password' => $configurationManager->borgRestorePassword,
|
||||||
@@ -181,8 +183,10 @@ $app->get('/containers', function (Request $request, Response $response, array $
|
|||||||
'community_containers' => $configurationManager->listAvailableCommunityContainers(),
|
'community_containers' => $configurationManager->listAvailableCommunityContainers(),
|
||||||
'community_containers_enabled' => $configurationManager->aioCommunityContainers,
|
'community_containers_enabled' => $configurationManager->aioCommunityContainers,
|
||||||
'bypass_container_update' => $bypass_container_update,
|
'bypass_container_update' => $bypass_container_update,
|
||||||
]);
|
// Do not cache the page as it shows credentials
|
||||||
|
])->withHeader('Cache-Control', 'no-store');
|
||||||
})->setName('profile');
|
})->setName('profile');
|
||||||
|
|
||||||
$app->get('/login', function (Request $request, Response $response, array $args) use ($container) {
|
$app->get('/login', function (Request $request, Response $response, array $args) use ($container) {
|
||||||
$view = Twig::fromRequest($request);
|
$view = Twig::fromRequest($request);
|
||||||
/** @var \AIO\Docker\DockerActionManager $dockerActionManager */
|
/** @var \AIO\Docker\DockerActionManager $dockerActionManager */
|
||||||
@@ -191,6 +195,7 @@ $app->get('/login', function (Request $request, Response $response, array $args)
|
|||||||
'is_login_allowed' => $dockerActionManager->isLoginAllowed(),
|
'is_login_allowed' => $dockerActionManager->isLoginAllowed(),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
$app->get('/setup', function (Request $request, Response $response, array $args) use ($container) {
|
$app->get('/setup', function (Request $request, Response $response, array $args) use ($container) {
|
||||||
$view = Twig::fromRequest($request);
|
$view = Twig::fromRequest($request);
|
||||||
/** @var \AIO\Data\Setup $setup */
|
/** @var \AIO\Data\Setup $setup */
|
||||||
@@ -209,8 +214,10 @@ $app->get('/setup', function (Request $request, Response $response, array $args)
|
|||||||
[
|
[
|
||||||
'password' => $setup->Setup(),
|
'password' => $setup->Setup(),
|
||||||
]
|
]
|
||||||
);
|
// Do not cache the page as it shows credentials
|
||||||
|
)->withHeader('Cache-Control', 'no-store');
|
||||||
});
|
});
|
||||||
|
|
||||||
$app->get('/log', function (Request $request, Response $response, array $args) use ($container) {
|
$app->get('/log', function (Request $request, Response $response, array $args) use ($container) {
|
||||||
$params = $request->getQueryParams();
|
$params = $request->getQueryParams();
|
||||||
$id = $params['id'] ?? '';
|
$id = $params['id'] ?? '';
|
||||||
@@ -218,7 +225,13 @@ $app->get('/log', function (Request $request, Response $response, array $args) u
|
|||||||
throw new DI\NotFoundException();
|
throw new DI\NotFoundException();
|
||||||
}
|
}
|
||||||
$view = Twig::fromRequest($request);
|
$view = Twig::fromRequest($request);
|
||||||
return $view->render($response, 'log.twig', ['id' => $id]);
|
return $view->render(
|
||||||
|
$response, 'log.twig',
|
||||||
|
[
|
||||||
|
'id' => $id
|
||||||
|
]
|
||||||
|
// Do not cache the page as it might shows credentials
|
||||||
|
)->withHeader('Cache-Control', 'no-store');
|
||||||
});
|
});
|
||||||
|
|
||||||
// Auth Redirector
|
// Auth Redirector
|
||||||
|
|||||||
+3
-1
@@ -10,6 +10,7 @@ pre {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
font-family: system-ui, -apple-system, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', 'Noto Sans', 'Liberation Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
|
||||||
}
|
}
|
||||||
#floating-box {
|
#floating-box {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@@ -26,7 +27,8 @@ pre {
|
|||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
font-size: large;
|
font-size: large;
|
||||||
border: solid thin gray;
|
border: solid thin gray;
|
||||||
background-color: #f9f9f9;
|
background-color: var(--color-main-background);
|
||||||
|
color: var(--color-main-text);
|
||||||
width: 10rem;
|
width: 10rem;
|
||||||
padding: 0.5rem 1rem;
|
padding: 0.5rem 1rem;
|
||||||
margin: 0 0 0 1rem;
|
margin: 0 0 0 1rem;
|
||||||
|
|||||||
+15
-5
@@ -483,8 +483,8 @@ input[type="checkbox"]:disabled:not(:checked) + label {
|
|||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
align-self: start;
|
align-self: start;
|
||||||
width: 300px;
|
width: min(600px, calc(100vw - 4rem));
|
||||||
height: 200px;
|
height: min(400px, calc(100vh - 14rem));
|
||||||
border-radius: var(--border-radius-large);
|
border-radius: var(--border-radius-large);
|
||||||
border: solid thin rgb(192, 192, 192);
|
border: solid thin rgb(192, 192, 192);
|
||||||
}
|
}
|
||||||
@@ -606,13 +606,15 @@ input[type="checkbox"]:disabled:not(:checked) + label {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#office-collabora:checked + .office-card,
|
#office-collabora:checked + .office-card,
|
||||||
#office-onlyoffice:checked + .office-card {
|
#office-onlyoffice:checked + .office-card,
|
||||||
|
#office-eurooffice:checked + .office-card {
|
||||||
border-color: var(--color-nextcloud-blue);
|
border-color: var(--color-nextcloud-blue);
|
||||||
background: linear-gradient(135deg, rgba(0, 130, 201, 0.08) 0%, rgba(0, 130, 201, 0.02) 100%);
|
background: linear-gradient(135deg, rgba(0, 130, 201, 0.08) 0%, rgba(0, 130, 201, 0.02) 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
[data-theme="dark"] #office-collabora:checked + .office-card,
|
[data-theme="dark"] #office-collabora:checked + .office-card,
|
||||||
[data-theme="dark"] #office-onlyoffice:checked + .office-card {
|
[data-theme="dark"] #office-onlyoffice:checked + .office-card,
|
||||||
|
[data-theme="dark"] #office-eurooffice:checked + .office-card {
|
||||||
background: linear-gradient(135deg, rgba(0, 145, 242, 0.15) 0%, rgba(0, 145, 242, 0.03) 100%);
|
background: linear-gradient(135deg, rgba(0, 145, 242, 0.15) 0%, rgba(0, 145, 242, 0.03) 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -631,13 +633,21 @@ input[type="checkbox"]:disabled:not(:checked) + label {
|
|||||||
color: var(--color-main-text);
|
color: var(--color-main-text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.office-powered-by {
|
||||||
|
margin: 4px 0 0;
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--color-main-text);
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
|
||||||
.office-checkmark {
|
.office-checkmark {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#office-collabora:checked + .office-card .office-checkmark,
|
#office-collabora:checked + .office-card .office-checkmark,
|
||||||
#office-onlyoffice:checked + .office-card .office-checkmark {
|
#office-onlyoffice:checked + .office-card .office-checkmark,
|
||||||
|
#office-eurooffice:checked + .office-card .office-checkmark {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ function toggleTheme() {
|
|||||||
|
|
||||||
function setThemeToDOM(value) {
|
function setThemeToDOM(value) {
|
||||||
// Set the theme to the root document and all possible iframe documents (so they can adapt their styling, too).
|
// Set the theme to the root document and all possible iframe documents (so they can adapt their styling, too).
|
||||||
const documents = [document, Array.from(document.querySelectorAll('iframe')).map((iframe) => iframe.contentDocument)].flat()
|
const documents = [document, ...Array.from(document.querySelectorAll('iframe')).map((iframe) => iframe.contentDocument).filter(Boolean)]
|
||||||
documents.forEach((doc) => doc.documentElement.setAttribute('data-theme', value));
|
documents.forEach((doc) => doc.documentElement.setAttribute('data-theme', value));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,4 +35,6 @@ setThemeToDOM(getSavedTheme());
|
|||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
setThemeIcon(getSavedTheme())
|
setThemeIcon(getSavedTheme())
|
||||||
document.querySelector('button#theme-toggle')?.addEventListener('click', () => toggleTheme());
|
document.querySelector('button#theme-toggle')?.addEventListener('click', () => toggleTheme());
|
||||||
|
// Re-apply theme when the overlay-log iframe navigates (e.g. after a form submission).
|
||||||
|
document.querySelector('iframe#overlay-log')?.addEventListener('load', () => setThemeToDOM(getSavedTheme()));
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -52,14 +52,18 @@ readonly class ContainerDefinitionFetcher {
|
|||||||
$standardContainerNames = array_column($data['aio_services_v1'], 'container_name');
|
$standardContainerNames = array_column($data['aio_services_v1'], 'container_name');
|
||||||
|
|
||||||
$additionalContainerNames = [];
|
$additionalContainerNames = [];
|
||||||
|
$additionalTopLevelContainerNames = [];
|
||||||
foreach ($this->configurationManager->aioCommunityContainers as $communityContainer) {
|
foreach ($this->configurationManager->aioCommunityContainers as $communityContainer) {
|
||||||
if ($communityContainer !== '') {
|
if ($communityContainer !== '') {
|
||||||
$path = DataConst::GetCommunityContainersDirectory() . '/' . $communityContainer . '/' . $communityContainer . '.json';
|
$path = DataConst::GetCommunityContainersDirectory() . '/' . $communityContainer . '/' . $communityContainer . '.json';
|
||||||
$additionalData = json_decode((string)file_get_contents($path), true, 512, JSON_THROW_ON_ERROR);
|
$additionalData = json_decode((string)file_get_contents($path), true, 512, JSON_THROW_ON_ERROR);
|
||||||
$data = array_merge_recursive($data, $additionalData);
|
$data = array_merge_recursive($data, $additionalData);
|
||||||
|
foreach ($additionalData['aio_services_v1'] as $additionalEntry) {
|
||||||
|
$additionalContainerNames[] = $additionalEntry['container_name'];
|
||||||
|
}
|
||||||
if (isset($additionalData['aio_services_v1'][0]['display_name']) && $additionalData['aio_services_v1'][0]['display_name'] !== '') {
|
if (isset($additionalData['aio_services_v1'][0]['display_name']) && $additionalData['aio_services_v1'][0]['display_name'] !== '') {
|
||||||
// Store container_name of community containers in variable for later
|
// Store main container_name of community containers in variable for later
|
||||||
$additionalContainerNames[] = $additionalData['aio_services_v1'][0]['container_name'];
|
$additionalTopLevelContainerNames[] = $additionalData['aio_services_v1'][0]['container_name'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,6 +78,10 @@ readonly class ContainerDefinitionFetcher {
|
|||||||
if (!$this->configurationManager->isOnlyofficeEnabled) {
|
if (!$this->configurationManager->isOnlyofficeEnabled) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
} elseif ($entry['container_name'] === 'nextcloud-aio-eurooffice') {
|
||||||
|
if (!$this->configurationManager->isEuroofficeEnabled) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
} elseif ($entry['container_name'] === 'nextcloud-aio-collabora') {
|
} elseif ($entry['container_name'] === 'nextcloud-aio-collabora') {
|
||||||
if (!$this->configurationManager->isCollaboraEnabled) {
|
if (!$this->configurationManager->isCollaboraEnabled) {
|
||||||
continue;
|
continue;
|
||||||
@@ -176,7 +184,7 @@ readonly class ContainerDefinitionFetcher {
|
|||||||
if ($entry['container_name'] === 'nextcloud-aio-apache') {
|
if ($entry['container_name'] === 'nextcloud-aio-apache') {
|
||||||
// Add community containers first and default ones last so that aio_variables works correctly
|
// Add community containers first and default ones last so that aio_variables works correctly
|
||||||
$valueDependsOnTemp = [];
|
$valueDependsOnTemp = [];
|
||||||
foreach ($additionalContainerNames as $containerName) {
|
foreach ($additionalTopLevelContainerNames as $containerName) {
|
||||||
$valueDependsOnTemp[] = $containerName;
|
$valueDependsOnTemp[] = $containerName;
|
||||||
}
|
}
|
||||||
$valueDependsOn = array_merge_recursive($valueDependsOnTemp, $valueDependsOn);
|
$valueDependsOn = array_merge_recursive($valueDependsOnTemp, $valueDependsOn);
|
||||||
@@ -190,6 +198,10 @@ readonly class ContainerDefinitionFetcher {
|
|||||||
if (!$this->configurationManager->isOnlyofficeEnabled) {
|
if (!$this->configurationManager->isOnlyofficeEnabled) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
} elseif ($value === 'nextcloud-aio-eurooffice') {
|
||||||
|
if (!$this->configurationManager->isEuroofficeEnabled) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
} elseif ($value === 'nextcloud-aio-collabora') {
|
} elseif ($value === 'nextcloud-aio-collabora') {
|
||||||
if (!$this->configurationManager->isCollaboraEnabled) {
|
if (!$this->configurationManager->isCollaboraEnabled) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -81,12 +81,19 @@ readonly class ConfigurationController {
|
|||||||
if ($officeSuiteChoice === 'collabora') {
|
if ($officeSuiteChoice === 'collabora') {
|
||||||
$this->configurationManager->isCollaboraEnabled = true;
|
$this->configurationManager->isCollaboraEnabled = true;
|
||||||
$this->configurationManager->isOnlyofficeEnabled = false;
|
$this->configurationManager->isOnlyofficeEnabled = false;
|
||||||
|
$this->configurationManager->isEuroofficeEnabled = false;
|
||||||
} elseif ($officeSuiteChoice === 'onlyoffice') {
|
} elseif ($officeSuiteChoice === 'onlyoffice') {
|
||||||
$this->configurationManager->isCollaboraEnabled = false;
|
$this->configurationManager->isCollaboraEnabled = false;
|
||||||
$this->configurationManager->isOnlyofficeEnabled = true;
|
$this->configurationManager->isOnlyofficeEnabled = true;
|
||||||
|
$this->configurationManager->isEuroofficeEnabled = false;
|
||||||
|
} elseif ($officeSuiteChoice === 'eurooffice') {
|
||||||
|
$this->configurationManager->isCollaboraEnabled = false;
|
||||||
|
$this->configurationManager->isOnlyofficeEnabled = false;
|
||||||
|
$this->configurationManager->isEuroofficeEnabled = true;
|
||||||
} else {
|
} else {
|
||||||
$this->configurationManager->isCollaboraEnabled = false;
|
$this->configurationManager->isCollaboraEnabled = false;
|
||||||
$this->configurationManager->isOnlyofficeEnabled = false;
|
$this->configurationManager->isOnlyofficeEnabled = false;
|
||||||
|
$this->configurationManager->isEuroofficeEnabled = false;
|
||||||
}
|
}
|
||||||
$this->configurationManager->isClamavEnabled = isset($request->getParsedBody()['clamav']);
|
$this->configurationManager->isClamavEnabled = isset($request->getParsedBody()['clamav']);
|
||||||
$this->configurationManager->isTalkEnabled = isset($request->getParsedBody()['talk']);
|
$this->configurationManager->isTalkEnabled = isset($request->getParsedBody()['talk']);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use Slim\Psr7\NonBufferedBody;
|
|||||||
|
|
||||||
readonly class DockerController {
|
readonly class DockerController {
|
||||||
private const string TOP_CONTAINER = 'nextcloud-aio-apache';
|
private const string TOP_CONTAINER = 'nextcloud-aio-apache';
|
||||||
|
private const string LATEST_MAJOR_VERSION = '34';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private DockerActionManager $dockerActionManager,
|
private DockerActionManager $dockerActionManager,
|
||||||
@@ -221,7 +222,7 @@ readonly class DockerController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isset($request->getParsedBody()['install_latest_major'])) {
|
if (isset($request->getParsedBody()['install_latest_major'])) {
|
||||||
$installLatestMajor = '33';
|
$installLatestMajor = self::LATEST_MAJOR_VERSION;
|
||||||
} else {
|
} else {
|
||||||
$installLatestMajor = '';
|
$installLatestMajor = '';
|
||||||
}
|
}
|
||||||
@@ -298,7 +299,7 @@ readonly class DockerController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($addToStreamingResponseBody !== null) {
|
if ($addToStreamingResponseBody !== null) {
|
||||||
$addToStreamingResponseBody($container, "Stopping container");
|
$addToStreamingResponseBody("Stopping container", $container);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop itself first and then all the dependencies
|
// Stop itself first and then all the dependencies
|
||||||
@@ -333,14 +334,30 @@ readonly class DockerController {
|
|||||||
return $response->withStatus(201)->withHeader('Location', '.');
|
return $response->withStatus(201)->withHeader('Location', '.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function RunNextcloudUpgradeToLatestMajor(Request $request, Response $response, array $args) : Response {
|
||||||
|
$this->configurationManager->installLatestMajor = self::LATEST_MAJOR_VERSION;
|
||||||
|
|
||||||
|
// Get streaming response start and closure
|
||||||
|
$nonbufResp = $this->startStreamingResponse($response);
|
||||||
|
$addToStreamingResponseBody = $this->getAddToStreamingResponseBody($nonbufResp);
|
||||||
|
|
||||||
|
$this->dockerActionManager->RunNextcloudUpgradeToLatestMajor($addToStreamingResponseBody);
|
||||||
|
|
||||||
|
// We automatically reload after 10s so that the output can be read or copied if necessary
|
||||||
|
$addToStreamingResponseBody("Automatically reloading the page after 10s.");
|
||||||
|
sleep(10);
|
||||||
|
|
||||||
|
// End streaming response
|
||||||
|
$this->finalizeStreamingResponse($nonbufResp);
|
||||||
|
return $nonbufResp;
|
||||||
|
}
|
||||||
|
|
||||||
public function SystemPrune(Request $request, Response $response, array $args) : Response {
|
public function SystemPrune(Request $request, Response $response, array $args) : Response {
|
||||||
// Get streaming response start and closure
|
// Get streaming response start and closure
|
||||||
$nonbufResp = $this->startStreamingResponse($response);
|
$nonbufResp = $this->startStreamingResponse($response);
|
||||||
|
|
||||||
$body = $nonbufResp->getBody();
|
$body = $nonbufResp->getBody();
|
||||||
$addToStreamingResponseBody = function (string $message) use ($body) : void {
|
$addToStreamingResponseBody = $this->getAddToStreamingResponseBody($nonbufResp);
|
||||||
$body->write("<div>$message</div>");
|
|
||||||
};
|
|
||||||
|
|
||||||
$this->dockerActionManager->SystemPrune($addToStreamingResponseBody);
|
$this->dockerActionManager->SystemPrune($addToStreamingResponseBody);
|
||||||
|
|
||||||
@@ -401,7 +418,8 @@ readonly class DockerController {
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" class="overlay-iframe">
|
<html lang="en" class="overlay-iframe">
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" href="../../style.css?v8" media="all" />
|
<link rel="stylesheet" href="../../style.css?v11" media="all" />
|
||||||
|
<script type="text/javascript" src="../../apply-theme.js?v1"></script>
|
||||||
<script type="text/javascript" src="../../scroll-into-view.js"></script>
|
<script type="text/javascript" src="../../scroll-into-view.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -425,12 +443,17 @@ readonly class DockerController {
|
|||||||
return $nonbufResp;
|
return $nonbufResp;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getAddToStreamingResponseBody(Response $nonbufResp) : ?\Closure {
|
private function getAddToStreamingResponseBody(Response $nonbufResp) : \Closure {
|
||||||
// Create a closure to pass around to the code, which should to the logging (because it e.g. decides
|
// Create a closure to pass around to the code, which should to the logging (because it e.g. decides
|
||||||
// if it'll actually pull an image), but which should not need to know anything about the
|
// if it'll actually pull an image), but which should not need to know anything about the
|
||||||
// wanted markup or formatting.
|
// wanted markup or formatting.
|
||||||
$addToStreamingResponseBody = function (Container $container, string $message) use ($nonbufResp) : void {
|
$addToStreamingResponseBody = function (string $message, ?Container $container = null) use ($nonbufResp) : void {
|
||||||
$nonbufResp->getBody()->write("<div>{$container->displayName}: {$message}</div>");
|
// Strip ANSI codes.
|
||||||
|
$message = preg_replace('/\e[[][A-Za-z0-9];?[0-9]*m?/', '', $message);
|
||||||
|
if ($container) {
|
||||||
|
$message = "{$container->displayName}: {$message}";
|
||||||
|
}
|
||||||
|
$nonbufResp->getBody()->write("<div>" . htmlspecialchars("{$message}", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</div>");
|
||||||
};
|
};
|
||||||
|
|
||||||
return $addToStreamingResponseBody;
|
return $addToStreamingResponseBody;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace AIO\Data;
|
|||||||
|
|
||||||
use AIO\Auth\PasswordGenerator;
|
use AIO\Auth\PasswordGenerator;
|
||||||
use AIO\Controller\DockerController;
|
use AIO\Controller\DockerController;
|
||||||
|
use AIO\Helper\NetworkHelper;
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use GuzzleHttp\Exception\TransferException;
|
use GuzzleHttp\Exception\TransferException;
|
||||||
|
|
||||||
@@ -98,6 +99,11 @@ class ConfigurationManager
|
|||||||
set { $this->set('isOnlyofficeEnabled', $value); }
|
set { $this->set('isOnlyofficeEnabled', $value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool $isEuroofficeEnabled {
|
||||||
|
get => $this->get('isEuroofficeEnabled', false);
|
||||||
|
set { $this->set('isEuroofficeEnabled', $value); }
|
||||||
|
}
|
||||||
|
|
||||||
public bool $isCollaboraEnabled {
|
public bool $isCollaboraEnabled {
|
||||||
// Type-cast because old configs could have 1/0 for this key.
|
// Type-cast because old configs could have 1/0 for this key.
|
||||||
get => (bool) $this->get('isCollaboraEnabled', true);
|
get => (bool) $this->get('isCollaboraEnabled', true);
|
||||||
@@ -1086,6 +1092,7 @@ class ConfigurationManager
|
|||||||
'CLAMAV_ENABLED' => $this->isClamavEnabled ? 'yes' : '',
|
'CLAMAV_ENABLED' => $this->isClamavEnabled ? 'yes' : '',
|
||||||
'TALK_RECORDING_ENABLED' => $this->isTalkRecordingEnabled ? 'yes' : '',
|
'TALK_RECORDING_ENABLED' => $this->isTalkRecordingEnabled ? 'yes' : '',
|
||||||
'ONLYOFFICE_ENABLED' => $this->isOnlyofficeEnabled ? 'yes' : '',
|
'ONLYOFFICE_ENABLED' => $this->isOnlyofficeEnabled ? 'yes' : '',
|
||||||
|
'EUROOFFICE_ENABLED' => $this->isEuroofficeEnabled ? 'yes' : '',
|
||||||
'COLLABORA_ENABLED' => $this->isCollaboraEnabled ? 'yes' : '',
|
'COLLABORA_ENABLED' => $this->isCollaboraEnabled ? 'yes' : '',
|
||||||
'TALK_ENABLED' => $this->isTalkEnabled ? 'yes' : '',
|
'TALK_ENABLED' => $this->isTalkEnabled ? 'yes' : '',
|
||||||
'UPDATE_NEXTCLOUD_APPS' => ($this->isDailyBackupRunning() && $this->areAutomaticUpdatesEnabled()) ? 'yes' : '',
|
'UPDATE_NEXTCLOUD_APPS' => ($this->isDailyBackupRunning() && $this->areAutomaticUpdatesEnabled()) ? 'yes' : '',
|
||||||
@@ -1111,9 +1118,9 @@ class ConfigurationManager
|
|||||||
'INSTALL_LATEST_MAJOR' => $this->installLatestMajor ? 'yes' : '',
|
'INSTALL_LATEST_MAJOR' => $this->installLatestMajor ? 'yes' : '',
|
||||||
'REMOVE_DISABLED_APPS' => $this->nextcloudKeepDisabledApps ? '' : 'yes',
|
'REMOVE_DISABLED_APPS' => $this->nextcloudKeepDisabledApps ? '' : 'yes',
|
||||||
// Allow to get local ip-address of database container which allows to talk to it even in host mode (the container that requires this needs to be started first then)
|
// Allow to get local ip-address of database container which allows to talk to it even in host mode (the container that requires this needs to be started first then)
|
||||||
'AIO_DATABASE_HOST' => gethostbyname('nextcloud-aio-database'),
|
'AIO_DATABASE_HOST' => NetworkHelper::resolveHostname('nextcloud-aio-database'),
|
||||||
// Allow to get local ip-address of caddy container and add it to trusted proxies automatically
|
// Allow to get local ip-address of caddy container and add it to trusted proxies automatically
|
||||||
'CADDY_IP_ADDRESS' => in_array('caddy', $this->aioCommunityContainers, true) ? gethostbyname('nextcloud-aio-caddy') : '',
|
'CADDY_IP_ADDRESS' => in_array('caddy', $this->aioCommunityContainers, true) ? NetworkHelper::resolveHostname('nextcloud-aio-caddy') : '',
|
||||||
'WHITEBOARD_ENABLED' => $this->isWhiteboardEnabled ? 'yes' : '',
|
'WHITEBOARD_ENABLED' => $this->isWhiteboardEnabled ? 'yes' : '',
|
||||||
'AIO_VERSION' => $this->getAioVersion(),
|
'AIO_VERSION' => $this->getAioVersion(),
|
||||||
default => $this->getRegisteredSecret($placeholder),
|
default => $this->getRegisteredSecret($placeholder),
|
||||||
|
|||||||
@@ -71,4 +71,5 @@ class DataConst {
|
|||||||
public static function GetAioVersionFile() : string {
|
public static function GetAioVersionFile() : string {
|
||||||
return (string)realpath(__DIR__ . '/../../templates/includes/aio-version.twig');
|
return (string)realpath(__DIR__ . '/../../templates/includes/aio-version.twig');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,10 @@ use AIO\Container\VersionState;
|
|||||||
use AIO\ContainerDefinitionFetcher;
|
use AIO\ContainerDefinitionFetcher;
|
||||||
use AIO\Data\ConfigurationManager;
|
use AIO\Data\ConfigurationManager;
|
||||||
use AIO\Data\DataConst;
|
use AIO\Data\DataConst;
|
||||||
|
use AIO\Helper\NetworkHelper;
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use GuzzleHttp\Exception\RequestException;
|
use GuzzleHttp\Exception\RequestException;
|
||||||
|
use GuzzleHttp\Psr7\Utils;
|
||||||
use http\Env\Response;
|
use http\Env\Response;
|
||||||
|
|
||||||
readonly class DockerActionManager {
|
readonly class DockerActionManager {
|
||||||
@@ -47,7 +49,7 @@ readonly class DockerActionManager {
|
|||||||
public function GetContainerRunningState(Container $container): ContainerState {
|
public function GetContainerRunningState(Container $container): ContainerState {
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($container->identifier)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($container->identifier)));
|
||||||
try {
|
try {
|
||||||
$response = $this->guzzleClient->get($url);
|
$response = $this->sendHttpRequest('GET', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() === 404) {
|
if ($e->getCode() === 404) {
|
||||||
return ContainerState::ImageDoesNotExist;
|
return ContainerState::ImageDoesNotExist;
|
||||||
@@ -67,7 +69,7 @@ readonly class DockerActionManager {
|
|||||||
public function GetContainerRestartingState(Container $container): ContainerState {
|
public function GetContainerRestartingState(Container $container): ContainerState {
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($container->identifier)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($container->identifier)));
|
||||||
try {
|
try {
|
||||||
$response = $this->guzzleClient->get($url);
|
$response = $this->sendHttpRequest('GET', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() === 404) {
|
if ($e->getCode() === 404) {
|
||||||
return ContainerState::ImageDoesNotExist;
|
return ContainerState::ImageDoesNotExist;
|
||||||
@@ -137,7 +139,7 @@ readonly class DockerActionManager {
|
|||||||
public function DeleteContainer(Container $container): void {
|
public function DeleteContainer(Container $container): void {
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s?v=true', urlencode($container->identifier)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s?v=true', urlencode($container->identifier)));
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->delete($url);
|
$this->sendHttpRequest('DELETE', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() !== 404) {
|
if ($e->getCode() !== 404) {
|
||||||
throw $e;
|
throw $e;
|
||||||
@@ -154,7 +156,7 @@ readonly class DockerActionManager {
|
|||||||
// Delete the borg cache volume
|
// Delete the borg cache volume
|
||||||
$url = $this->BuildApiUrl('volumes/nextcloud_aio_backup_cache');
|
$url = $this->BuildApiUrl('volumes/nextcloud_aio_backup_cache');
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->delete($url);
|
$this->sendHttpRequest('DELETE', $url);
|
||||||
error_log('nextcloud_aio_backup_cache volume deleted successfully.');
|
error_log('nextcloud_aio_backup_cache volume deleted successfully.');
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() !== 404) {
|
if ($e->getCode() !== 404) {
|
||||||
@@ -173,7 +175,7 @@ readonly class DockerActionManager {
|
|||||||
urlencode($id),
|
urlencode($id),
|
||||||
$since
|
$since
|
||||||
));
|
));
|
||||||
$responseBody = (string)$this->guzzleClient->get($url)->getBody();
|
$responseBody = (string)$this->sendHttpRequest('GET', $url)->getBody();
|
||||||
|
|
||||||
$response = "";
|
$response = "";
|
||||||
$separator = "\r\n";
|
$separator = "\r\n";
|
||||||
@@ -193,9 +195,9 @@ readonly class DockerActionManager {
|
|||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/start', urlencode($container->identifier)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/start', urlencode($container->identifier)));
|
||||||
try {
|
try {
|
||||||
if ($addToStreamingResponseBody !== null) {
|
if ($addToStreamingResponseBody !== null) {
|
||||||
$addToStreamingResponseBody($container, "Starting container");
|
$addToStreamingResponseBody("Starting container", $container);
|
||||||
}
|
}
|
||||||
$this->guzzleClient->post($url);
|
$this->sendHttpRequest('POST', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
throw new \Exception("Could not start container " . $container->identifier . ": " . $e->getResponse()?->getBody()->getContents());
|
throw new \Exception("Could not start container " . $container->identifier . ": " . $e->getResponse()?->getBody()->getContents());
|
||||||
}
|
}
|
||||||
@@ -214,7 +216,7 @@ readonly class DockerActionManager {
|
|||||||
|
|
||||||
$firstChar = substr($volume->name, 0, 1);
|
$firstChar = substr($volume->name, 0, 1);
|
||||||
if (!in_array($firstChar, $forbiddenChars)) {
|
if (!in_array($firstChar, $forbiddenChars)) {
|
||||||
$this->guzzleClient->request(
|
$this->sendHttpRequest(
|
||||||
'POST',
|
'POST',
|
||||||
$url,
|
$url,
|
||||||
[
|
[
|
||||||
@@ -449,7 +451,7 @@ readonly class DockerActionManager {
|
|||||||
|
|
||||||
// Special things for the jellyfin community container
|
// Special things for the jellyfin community container
|
||||||
} elseif ($container->identifier === 'nextcloud-aio-jellyfin') {
|
} elseif ($container->identifier === 'nextcloud-aio-jellyfin') {
|
||||||
$lldapIp = gethostbyname('nextcloud-aio-lldap');
|
$lldapIp = NetworkHelper::resolveHostname('nextcloud-aio-lldap');
|
||||||
if ($lldapIp !== 'nextcloud-aio-lldap') {
|
if ($lldapIp !== 'nextcloud-aio-lldap') {
|
||||||
$requestBody['HostConfig']['ExtraHosts'] = ['nextcloud-aio-lldap:' . $lldapIp];
|
$requestBody['HostConfig']['ExtraHosts'] = ['nextcloud-aio-lldap:' . $lldapIp];
|
||||||
}
|
}
|
||||||
@@ -484,15 +486,16 @@ readonly class DockerActionManager {
|
|||||||
|
|
||||||
// All AIO-managed containers should not be updated externally via watchtower but gracefully by AIO's backup and update feature.
|
// All AIO-managed containers should not be updated externally via watchtower but gracefully by AIO's backup and update feature.
|
||||||
// Also DIUN should not send update notifications. See https://crazymax.dev/diun/providers/docker/#docker-labels
|
// Also DIUN should not send update notifications. See https://crazymax.dev/diun/providers/docker/#docker-labels
|
||||||
|
// Also Dockhand should not be auto updating the containers. See https://dockhand.pro/manual/#container-labels-behavior
|
||||||
// Additionally set a default org.label-schema.vendor and com.docker.compose.project
|
// Additionally set a default org.label-schema.vendor and com.docker.compose.project
|
||||||
$requestBody['Labels'] = ["com.centurylinklabs.watchtower.enable" => "false", "wud.watch" => "false", "diun.enable" => "false", "org.label-schema.vendor" => "Nextcloud", "com.docker.compose.project" => "nextcloud-aio"];
|
$requestBody['Labels'] = ["com.centurylinklabs.watchtower.enable" => "false", "wud.watch" => "false", "diun.enable" => "false", "dockhand.update" => "false", "org.label-schema.vendor" => "Nextcloud", "com.docker.compose.project" => "nextcloud-aio"];
|
||||||
|
|
||||||
// Containers should have a fixed host name. See https://github.com/nextcloud/all-in-one/discussions/6589
|
// Containers should have a fixed host name. See https://github.com/nextcloud/all-in-one/discussions/6589
|
||||||
$requestBody['Hostname'] = $container->identifier;
|
$requestBody['Hostname'] = $container->identifier;
|
||||||
|
|
||||||
$url = $this->BuildApiUrl('containers/create?name=' . $container->identifier);
|
$url = $this->BuildApiUrl('containers/create?name=' . $container->identifier);
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->request(
|
$this->sendHttpRequest(
|
||||||
'POST',
|
'POST',
|
||||||
$url,
|
$url,
|
||||||
[
|
[
|
||||||
@@ -549,10 +552,10 @@ readonly class DockerActionManager {
|
|||||||
$imageIsThere = true;
|
$imageIsThere = true;
|
||||||
try {
|
try {
|
||||||
if ($addToStreamingResponseBody) {
|
if ($addToStreamingResponseBody) {
|
||||||
$addToStreamingResponseBody($container, "Pulling image");
|
$addToStreamingResponseBody("Pulling image", $container);
|
||||||
}
|
}
|
||||||
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $encodedImageName));
|
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $encodedImageName));
|
||||||
$this->guzzleClient->get($imageUrl)->getBody()->getContents();
|
$this->sendHttpRequest('GET', $imageUrl)->getBody()->getContents();
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$imageIsThere = false;
|
$imageIsThere = false;
|
||||||
}
|
}
|
||||||
@@ -560,7 +563,7 @@ readonly class DockerActionManager {
|
|||||||
$maxRetries = 3;
|
$maxRetries = 3;
|
||||||
for ($attempt = 1; $attempt <= $maxRetries; $attempt++) {
|
for ($attempt = 1; $attempt <= $maxRetries; $attempt++) {
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->post($url);
|
$this->sendHttpRequest('POST', $url);
|
||||||
break;
|
break;
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
$message = "Could not pull image " . $imageName . " (attempt $attempt/$maxRetries): " . $e->getResponse()?->getBody()->getContents();
|
$message = "Could not pull image " . $imageName . " (attempt $attempt/$maxRetries): " . $e->getResponse()?->getBody()->getContents();
|
||||||
@@ -645,11 +648,11 @@ readonly class DockerActionManager {
|
|||||||
private function GetRepoDigestsOfContainer(string $containerName): ?array {
|
private function GetRepoDigestsOfContainer(string $containerName): ?array {
|
||||||
try {
|
try {
|
||||||
$containerUrl = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
|
$containerUrl = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
|
||||||
$containerOutput = json_decode($this->guzzleClient->get($containerUrl)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
$containerOutput = json_decode($this->sendHttpRequest('GET', $containerUrl)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
||||||
$imageName = $containerOutput['Image'];
|
$imageName = $containerOutput['Image'];
|
||||||
|
|
||||||
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
|
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
|
||||||
$imageOutput = json_decode($this->guzzleClient->get($imageUrl)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
$imageOutput = json_decode($this->sendHttpRequest('GET', $imageUrl)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
if (!isset($imageOutput['RepoDigests'])) {
|
if (!isset($imageOutput['RepoDigests'])) {
|
||||||
error_log('RepoDigests is not set of container ' . $containerName);
|
error_log('RepoDigests is not set of container ' . $containerName);
|
||||||
@@ -693,7 +696,7 @@ readonly class DockerActionManager {
|
|||||||
$containerName = 'nextcloud-aio-mastercontainer';
|
$containerName = 'nextcloud-aio-mastercontainer';
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
|
||||||
try {
|
try {
|
||||||
$output = json_decode($this->guzzleClient->get($url)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
$output = json_decode($this->sendHttpRequest('GET', $url)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
||||||
$imageNameArray = explode(':', $output['Config']['Image']);
|
$imageNameArray = explode(':', $output['Config']['Image']);
|
||||||
if (count($imageNameArray) === 2) {
|
if (count($imageNameArray) === 2) {
|
||||||
$imageName = $imageNameArray[0];
|
$imageName = $imageNameArray[0];
|
||||||
@@ -720,7 +723,7 @@ readonly class DockerActionManager {
|
|||||||
$containerName = 'nextcloud-aio-mastercontainer';
|
$containerName = 'nextcloud-aio-mastercontainer';
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/json', $containerName));
|
||||||
try {
|
try {
|
||||||
$output = json_decode($this->guzzleClient->get($url)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
$output = json_decode($this->sendHttpRequest('GET', $url)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
||||||
$tagArray = explode(':', $output['Config']['Image']);
|
$tagArray = explode(':', $output['Config']['Image']);
|
||||||
if (count($tagArray) === 2) {
|
if (count($tagArray) === 2) {
|
||||||
$tag = $tagArray[1];
|
$tag = $tagArray[1];
|
||||||
@@ -761,26 +764,37 @@ readonly class DockerActionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function sendNotification(Container $container, string $subject, string $message, string $file = '/notify.sh'): void {
|
public function sendNotification(Container $container, string $subject, string $message, string $file = '/notify.sh'): void {
|
||||||
if ($this->GetContainerStartingState($container) === ContainerState::Running) {
|
$this->execCommandInContainer($container, ['bash', $file, $subject, $message]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function execCommandInContainer(Container $container, array $cmd, ?\Closure $outputCallback = null): void {
|
||||||
|
if ($cmd === []) {
|
||||||
|
throw new \InvalidArgumentException('$cmd must not be empty.');
|
||||||
|
}
|
||||||
|
foreach ($cmd as $arg) {
|
||||||
|
if (!is_string($arg) || $arg === '') {
|
||||||
|
throw new \InvalidArgumentException('Every element of $cmd must be a non-empty string.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->GetContainerStartingState($container) !== ContainerState::Running) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$containerName = $container->identifier;
|
$containerName = $container->identifier;
|
||||||
|
|
||||||
// schedule the exec
|
// Create exec instance
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/exec', urlencode($containerName)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/exec', urlencode($containerName)));
|
||||||
$response = json_decode(
|
$response = json_decode(
|
||||||
$this->guzzleClient->request(
|
$this->sendHttpRequest(
|
||||||
'POST',
|
'POST',
|
||||||
$url,
|
$url,
|
||||||
[
|
[
|
||||||
'json' => [
|
'json' => [
|
||||||
'AttachStdout' => true,
|
'AttachStdout' => true,
|
||||||
|
'AttachStderr' => true,
|
||||||
'Tty' => true,
|
'Tty' => true,
|
||||||
'Cmd' => [
|
'Cmd' => $cmd,
|
||||||
'bash',
|
|
||||||
$file,
|
|
||||||
$subject,
|
|
||||||
$message
|
|
||||||
],
|
|
||||||
],
|
],
|
||||||
]
|
]
|
||||||
)->getBody()->getContents(),
|
)->getBody()->getContents(),
|
||||||
@@ -789,20 +803,30 @@ readonly class DockerActionManager {
|
|||||||
JSON_THROW_ON_ERROR,
|
JSON_THROW_ON_ERROR,
|
||||||
);
|
);
|
||||||
|
|
||||||
$id = $response['Id'];
|
$execId = $response['Id'];
|
||||||
|
|
||||||
// start the exec
|
// Start exec
|
||||||
$url = $this->BuildApiUrl(sprintf('exec/%s/start', $id));
|
$url = $this->BuildApiUrl(sprintf('exec/%s/start', $execId));
|
||||||
$this->guzzleClient->request(
|
$requestOptions = [
|
||||||
'POST',
|
|
||||||
$url,
|
|
||||||
[
|
|
||||||
'json' => [
|
'json' => [
|
||||||
'Detach' => false,
|
'Detach' => false,
|
||||||
'Tty' => true,
|
'Tty' => true,
|
||||||
],
|
],
|
||||||
]
|
];
|
||||||
);
|
if ($outputCallback !== null) {
|
||||||
|
$requestOptions['stream'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$startResponse = $this->sendHttpRequest('POST', $url, $requestOptions);
|
||||||
|
|
||||||
|
if ($outputCallback !== null) {
|
||||||
|
$body = $startResponse->getBody();
|
||||||
|
while (!$body->eof()) {
|
||||||
|
$line = rtrim(Utils::readLine($body), "\r");;
|
||||||
|
if ($line !== '') {
|
||||||
|
$outputCallback($line);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -813,7 +837,7 @@ readonly class DockerActionManager {
|
|||||||
);
|
);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->request(
|
$this->sendHttpRequest(
|
||||||
'POST',
|
'POST',
|
||||||
$url,
|
$url,
|
||||||
[
|
[
|
||||||
@@ -834,7 +858,7 @@ readonly class DockerActionManager {
|
|||||||
if ($createNetwork) {
|
if ($createNetwork) {
|
||||||
$url = $this->BuildApiUrl('networks/create');
|
$url = $this->BuildApiUrl('networks/create');
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->request(
|
$this->sendHttpRequest(
|
||||||
'POST',
|
'POST',
|
||||||
$url,
|
$url,
|
||||||
[
|
[
|
||||||
@@ -863,7 +887,7 @@ readonly class DockerActionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->request(
|
$this->sendHttpRequest(
|
||||||
'POST',
|
'POST',
|
||||||
$url,
|
$url,
|
||||||
[
|
[
|
||||||
@@ -908,7 +932,7 @@ readonly class DockerActionManager {
|
|||||||
}
|
}
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/stop?t=%s', urlencode($container->identifier), $maxShutDownTime));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/stop?t=%s', urlencode($container->identifier), $maxShutDownTime));
|
||||||
try {
|
try {
|
||||||
$this->guzzleClient->post($url);
|
$this->sendHttpRequest('POST', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() !== 404 && $e->getCode() !== 304) {
|
if ($e->getCode() !== 404 && $e->getCode() !== 304) {
|
||||||
throw $e;
|
throw $e;
|
||||||
@@ -920,7 +944,7 @@ readonly class DockerActionManager {
|
|||||||
$containerName = 'nextcloud-aio-borgbackup';
|
$containerName = 'nextcloud-aio-borgbackup';
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($containerName)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($containerName)));
|
||||||
try {
|
try {
|
||||||
$response = $this->guzzleClient->get($url);
|
$response = $this->sendHttpRequest('GET', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() === 404) {
|
if ($e->getCode() === 404) {
|
||||||
return -1;
|
return -1;
|
||||||
@@ -942,7 +966,7 @@ readonly class DockerActionManager {
|
|||||||
$containerName = 'nextcloud-aio-database';
|
$containerName = 'nextcloud-aio-database';
|
||||||
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($containerName)));
|
$url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($containerName)));
|
||||||
try {
|
try {
|
||||||
$response = $this->guzzleClient->get($url);
|
$response = $this->sendHttpRequest('GET', $url);
|
||||||
} catch (RequestException $e) {
|
} catch (RequestException $e) {
|
||||||
if ($e->getCode() === 404) {
|
if ($e->getCode() === 404) {
|
||||||
return -1;
|
return -1;
|
||||||
@@ -982,7 +1006,7 @@ readonly class DockerActionManager {
|
|||||||
$imageName = $imageName . ':' . $this->GetCurrentChannel();
|
$imageName = $imageName . ':' . $this->GetCurrentChannel();
|
||||||
try {
|
try {
|
||||||
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
|
$imageUrl = $this->BuildApiUrl(sprintf('images/%s/json', $imageName));
|
||||||
$imageOutput = json_decode($this->guzzleClient->get($imageUrl)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
$imageOutput = json_decode($this->sendHttpRequest('GET', $imageUrl)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
if (!isset($imageOutput['Created'])) {
|
if (!isset($imageOutput['Created'])) {
|
||||||
error_log('Created is not set of image ' . $imageName);
|
error_log('Created is not set of image ' . $imageName);
|
||||||
@@ -1027,6 +1051,11 @@ readonly class DockerActionManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function RunNextcloudUpgradeToLatestMajor(\Closure $addToStreamingResponseBody): void {
|
||||||
|
$container = $this->containerDefinitionFetcher->GetContainerById('nextcloud-aio-nextcloud');
|
||||||
|
$this->execCommandInContainer($container, ['bash', '/upgrade-latest-major.sh'], $addToStreamingResponseBody);
|
||||||
|
}
|
||||||
|
|
||||||
public function SystemPrune(?\Closure $addToStreamingResponseBody = null): void {
|
public function SystemPrune(?\Closure $addToStreamingResponseBody = null): void {
|
||||||
$endpoints = [
|
$endpoints = [
|
||||||
// Remove stopped containers
|
// Remove stopped containers
|
||||||
@@ -1055,7 +1084,7 @@ readonly class DockerActionManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$response = $this->guzzleClient->post($url);
|
$response = $this->sendHttpRequest('POST', $url);
|
||||||
if ($addToStreamingResponseBody !== null) {
|
if ($addToStreamingResponseBody !== null) {
|
||||||
$data = json_decode((string)$response->getBody(), true);
|
$data = json_decode((string)$response->getBody(), true);
|
||||||
$deleted = 0;
|
$deleted = 0;
|
||||||
@@ -1093,4 +1122,12 @@ readonly class DockerActionManager {
|
|||||||
sleep(10);
|
sleep(10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function sendHttpRequest(string $httpMethod, string $url, array $requestOptions = []): \Psr\Http\Message\ResponseInterface {
|
||||||
|
if (($requestOptions['stream'] ?? null) === true) {
|
||||||
|
$requestOptions['proxy'] = 'unix:///var/run/docker.sock';
|
||||||
|
}
|
||||||
|
return $this->guzzleClient->request($httpMethod, $url, $requestOptions);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -3,8 +3,6 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace AIO\Docker;
|
namespace AIO\Docker;
|
||||||
|
|
||||||
use AIO\ContainerDefinitionFetcher;
|
|
||||||
use AIO\Data\ConfigurationManager;
|
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
|
|
||||||
readonly class DockerHubManager {
|
readonly class DockerHubManager {
|
||||||
@@ -15,6 +13,16 @@ readonly class DockerHubManager {
|
|||||||
$this->guzzleClient = new Client();
|
$this->guzzleClient = new Client();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Official Docker Hub images need the library/ prefix when using the registry API directly.
|
||||||
|
private function normalizeImageName(string $name): string {
|
||||||
|
if (!str_contains($name, '/')) {
|
||||||
|
return 'library/' . $name;
|
||||||
|
}
|
||||||
|
return $name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function GetLatestDigestOfTag(string $name, string $tag) : ?string {
|
public function GetLatestDigestOfTag(string $name, string $tag) : ?string {
|
||||||
$cacheKey = 'dockerhub-manifest-' . $name . $tag;
|
$cacheKey = 'dockerhub-manifest-' . $name . $tag;
|
||||||
|
|
||||||
@@ -24,6 +32,7 @@ readonly class DockerHubManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If one of the links below should ever become outdated, we can still upgrade the mastercontainer via the webinterface manually by opening '/api/docker/getwatchtower'
|
// If one of the links below should ever become outdated, we can still upgrade the mastercontainer via the webinterface manually by opening '/api/docker/getwatchtower'
|
||||||
|
$name = $this->normalizeImageName($name);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$authTokenRequest = $this->guzzleClient->request(
|
$authTokenRequest = $this->guzzleClient->request(
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace AIO\Helper;
|
||||||
|
|
||||||
|
class NetworkHelper {
|
||||||
|
/**
|
||||||
|
* Resolve a hostname to its IP address, trying IPv4 first and falling back
|
||||||
|
* to IPv6 (AAAA record) when no A record is found. Returns the hostname
|
||||||
|
* unchanged when neither record resolves successfully.
|
||||||
|
*/
|
||||||
|
public static function resolveHostname(string $hostname): string {
|
||||||
|
$ipv4 = gethostbyname($hostname);
|
||||||
|
if ($ipv4 !== $hostname) {
|
||||||
|
return $ipv4;
|
||||||
|
}
|
||||||
|
$records = dns_get_record($hostname, DNS_AAAA);
|
||||||
|
if (is_array($records) && isset($records[0]['ipv6']) && $records[0]['ipv6'] !== '') {
|
||||||
|
return $records[0]['ipv6'];
|
||||||
|
}
|
||||||
|
return $hostname;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
<script type="text/javascript" src="timezone.js?v1"></script>
|
<script type="text/javascript" src="timezone.js?v1"></script>
|
||||||
|
|
||||||
{# js for optional containers and additional containers forms #}
|
{# js for optional containers and additional containers forms #}
|
||||||
<script type="text/javascript" src="containers-form-submit.js?v7"></script>
|
<script type="text/javascript" src="containers-form-submit.js?v8"></script>
|
||||||
|
|
||||||
{% set hasBackupLocation = borg_backup_host_location or borg_remote_repo %}
|
{% set hasBackupLocation = borg_backup_host_location or borg_remote_repo %}
|
||||||
{% set isAnyRunning = false %}
|
{% set isAnyRunning = false %}
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
{% set isBackupOrRestoreRunning = false %}
|
{% set isBackupOrRestoreRunning = false %}
|
||||||
{% set isApacheStarting = false %}
|
{% set isApacheStarting = false %}
|
||||||
{# Setting newMajorVersion to '' will hide corresponding options/elements, can be set to an integer like 26 in order to show corresponding elements. If set, also increase installLatestMajor in https://github.com/nextcloud/all-in-one/blob/main/php/src/Controller/DockerController.php #}
|
{# Setting newMajorVersion to '' will hide corresponding options/elements, can be set to an integer like 26 in order to show corresponding elements. If set, also increase installLatestMajor in https://github.com/nextcloud/all-in-one/blob/main/php/src/Controller/DockerController.php #}
|
||||||
{% set newMajorVersionString = '' %}
|
{% set newMajorVersionString = '26 Spring' %}
|
||||||
{% set oldMajorVersionString = '25 Autumn' %}
|
{% set oldMajorVersionString = '25 Autumn' %}
|
||||||
|
|
||||||
{% if is_backup_container_running == true %}
|
{% if is_backup_container_running == true %}
|
||||||
@@ -298,7 +298,12 @@
|
|||||||
{% if newMajorVersionString != '' and isAnyRunning == true and isApacheStarting != true %}
|
{% if newMajorVersionString != '' and isAnyRunning == true and isApacheStarting != true %}
|
||||||
<details>
|
<details>
|
||||||
<summary>Note about <strong>Nextcloud Hub {{ newMajorVersionString }}</strong></summary>
|
<summary>Note about <strong>Nextcloud Hub {{ newMajorVersionString }}</strong></summary>
|
||||||
<p>If you haven't upgraded to Nextcloud Hub {{ newMajorVersionString }} yet and want to do that now, feel free to follow <strong><a target="_blank" href="https://github.com/nextcloud/all-in-one/discussions/7523">this documentation</a></strong></p>
|
<p>If you haven't upgraded to Nextcloud Hub {{ newMajorVersionString }} yet and want to do that now, feel free to click the button below. ⚠️ Warning: make sure to create a backup before clicking the button as the update can go wrong and will leave your instance in a broken state!</p>
|
||||||
|
<form method="POST" action="api/docker/nextcloud-upgrade-to-latest-major" target="overlay-log">
|
||||||
|
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
|
||||||
|
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
|
||||||
|
<input type="submit" value="Upgrade to Nextcloud Hub {{ newMajorVersionString }}" data-confirm="Upgrade to Nextcloud Hub {{ newMajorVersionString }}? You should consider creating a backup first." />
|
||||||
|
</form>
|
||||||
</details>
|
</details>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
13.0.4
|
13.2.0
|
||||||
|
|||||||
@@ -14,6 +14,42 @@
|
|||||||
<p>Choose your preferred office suite. Only one can be enabled at a time.</p>
|
<p>Choose your preferred office suite. Only one can be enabled at a time.</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="office-suite-cards">
|
<div class="office-suite-cards">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
id="office-eurooffice"
|
||||||
|
name="office_suite_choice"
|
||||||
|
value="eurooffice"
|
||||||
|
class="office-radio"
|
||||||
|
{% if is_eurooffice_enabled == true %}
|
||||||
|
checked="checked"
|
||||||
|
{% endif %}
|
||||||
|
>
|
||||||
|
<label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-eurooffice">
|
||||||
|
<div class="office-card-header">
|
||||||
|
<div>
|
||||||
|
<h4>Nextcloud Office</h4>
|
||||||
|
<p class="office-powered-by">powered by Euro-Office</p>
|
||||||
|
</div>
|
||||||
|
<svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
|
||||||
|
<path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<ul class="office-features">
|
||||||
|
<li>Good Nextcloud integration</li>
|
||||||
|
<li>Open source</li>
|
||||||
|
<li>Best performance</li>
|
||||||
|
<li>Limited ODF compatibility</li>
|
||||||
|
<li>Best Microsoft compatibility</li>
|
||||||
|
<li>Good security</li>
|
||||||
|
</ul>
|
||||||
|
{% if isAnyRunning == false %}
|
||||||
|
<a href="https://github.com/Euro-Office" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
|
||||||
|
Learn more
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</label>
|
||||||
|
<input type="hidden" id="eurooffice" name="eurooffice" value="" data-initial-state="{% if is_eurooffice_enabled == true %}true{% else %}false{% endif %}">
|
||||||
<input
|
<input
|
||||||
type="radio"
|
type="radio"
|
||||||
id="office-collabora"
|
id="office-collabora"
|
||||||
@@ -26,7 +62,10 @@
|
|||||||
>
|
>
|
||||||
<label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-collabora">
|
<label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-collabora">
|
||||||
<div class="office-card-header">
|
<div class="office-card-header">
|
||||||
|
<div>
|
||||||
<h4>Nextcloud Office</h4>
|
<h4>Nextcloud Office</h4>
|
||||||
|
<p class="office-powered-by">powered by Collabora Online</p>
|
||||||
|
</div>
|
||||||
<svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
<svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
<circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
|
<circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
|
||||||
<path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
<path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
@@ -36,9 +75,9 @@
|
|||||||
<li>Best Nextcloud integration</li>
|
<li>Best Nextcloud integration</li>
|
||||||
<li>Open source</li>
|
<li>Open source</li>
|
||||||
<li>Good performance</li>
|
<li>Good performance</li>
|
||||||
<li>Best security: documents never leave your server</li>
|
|
||||||
<li>Best ODF compatibility</li>
|
<li>Best ODF compatibility</li>
|
||||||
<li>Best support for legacy files</li>
|
<li>Best support for legacy files</li>
|
||||||
|
<li>Best security: documents never leave your server</li>
|
||||||
</ul>
|
</ul>
|
||||||
{% if isAnyRunning == false %}
|
{% if isAnyRunning == false %}
|
||||||
<a href="https://www.collaboraoffice.com/code/" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
|
<a href="https://www.collaboraoffice.com/code/" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
|
||||||
@@ -60,18 +99,22 @@
|
|||||||
>
|
>
|
||||||
<label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-onlyoffice">
|
<label class="office-card{{ isAnyRunning ? ' office-card-disabled' : '' }}" for="office-onlyoffice">
|
||||||
<div class="office-card-header">
|
<div class="office-card-header">
|
||||||
<h4>OnlyOffice</h4>
|
<div>
|
||||||
|
<h4>ONLYOFFICE</h4>
|
||||||
|
<p class="office-powered-by">by Ascensio System SIA</p>
|
||||||
|
</div>
|
||||||
<svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
<svg class="office-checkmark" width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
<circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
|
<circle cx="12" cy="12" r="10" fill="var(--color-nextcloud-blue)"/>
|
||||||
<path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
<path d="M7 12L10.5 15.5L17 9" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<ul class="office-features">
|
<ul class="office-features">
|
||||||
<li>Good Nextcloud integration</li>
|
<li>OK Nextcloud integration</li>
|
||||||
<li>Open core</li>
|
<li>Open Core</li>
|
||||||
<li>Best performance</li>
|
<li>Best performance</li>
|
||||||
<li>Best Microsoft compatibility</li>
|
|
||||||
<li>Limited ODF compatibility</li>
|
<li>Limited ODF compatibility</li>
|
||||||
|
<li>Best Microsoft compatibility</li>
|
||||||
|
<li>Good security</li>
|
||||||
</ul>
|
</ul>
|
||||||
{% if isAnyRunning == false %}
|
{% if isAnyRunning == false %}
|
||||||
<a href="https://www.onlyoffice.com/" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
|
<a href="https://www.onlyoffice.com/" target="_blank" class="office-learn-more" data-stop-event-propagation="true">
|
||||||
@@ -90,7 +133,7 @@
|
|||||||
name="office_suite_choice"
|
name="office_suite_choice"
|
||||||
value=""
|
value=""
|
||||||
class="office-radio"
|
class="office-radio"
|
||||||
{% if is_collabora_enabled == false and is_onlyoffice_enabled == false %}
|
{% if is_collabora_enabled == false and is_onlyoffice_enabled == false and is_eurooffice_enabled == false %}
|
||||||
checked="checked"
|
checked="checked"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
>
|
>
|
||||||
@@ -224,7 +267,7 @@
|
|||||||
</form>
|
</form>
|
||||||
<p><strong>Minimal system requirements:</strong> When any optional container is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV, Nextcloud Talk Recording-server or Fulltextsearch, at least 3GB RAM are required. For Talk Recording-server additional 2 vCPUs are required. When enabling everything, at least 5GB RAM and a quad-core CPU are required. Recommended are at least 1GB more RAM than the minimal requirement. For further advice and recommendations see <strong><a target="_blank" href="https://github.com/nextcloud/all-in-one/discussions/1335">this documentation</a></strong></p>
|
<p><strong>Minimal system requirements:</strong> When any optional container is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV, Nextcloud Talk Recording-server or Fulltextsearch, at least 3GB RAM are required. For Talk Recording-server additional 2 vCPUs are required. When enabling everything, at least 5GB RAM and a quad-core CPU are required. Recommended are at least 1GB more RAM than the minimal requirement. For further advice and recommendations see <strong><a target="_blank" href="https://github.com/nextcloud/all-in-one/discussions/1335">this documentation</a></strong></p>
|
||||||
{% if isAnyRunning == true %}
|
{% if isAnyRunning == true %}
|
||||||
<script type="text/javascript" src="disable-containers.js"></script>
|
<script type="text/javascript" src="disable-containers.js?v1"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if is_collabora_enabled == true and isAnyRunning == false and was_start_button_clicked == true %}
|
{% if is_collabora_enabled == true and isAnyRunning == false and was_start_button_clicked == true %}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user