Compare commits

...

41 Commits

Author SHA1 Message Date
szaimen
be299dfe8c add it to mastercontainer as well
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-06 23:22:19 +02:00
szaimen
56af317778 use correct config syntax
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-06 23:02:59 +02:00
szaimen
1cf6f995d4 increase to 2.0.4
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-06 22:42:18 +02:00
Simon L
dc97ef872e Merge pull request #1206 from nextcloud/enh/noid/synology-rp
add Synology Reverse Proxyy to reverse proxy documentation
2022-10-06 22:40:14 +02:00
Simon L
99cf7f385a Merge pull request #1231 from nextcloud/enh/1221/add-free-disk-space
add a check for free space
2022-10-06 22:39:26 +02:00
Simon L
a721e250bd Merge pull request #1232 from nextcloud/enh/1204/change-healthcheck-to-nc
use netcat for healthchecks
2022-10-06 22:39:01 +02:00
szaimen
95311fd7c3 use netcat for healthchecks
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-06 22:34:10 +02:00
szaimen
abbeaa31d7 add a check for free space
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-06 20:08:46 +02:00
Simon L
ac06db59c7 Merge pull request #1229 from nextcloud/enh/1222/add-channel-hint
add channel advice
2022-10-06 19:54:44 +02:00
Simon L
3904e24ee0 Merge pull request #1228 from nextcloud/nextcloud-container-update
Nextcloud update
2022-10-06 19:53:31 +02:00
Simon L
e80fd26fdb Merge pull request #1225 from nextcloud/dependabot/docker/Containers/apache/debian-bullseye-20221004-slim
Bump debian from bullseye-20220912-slim to bullseye-20221004-slim in /Containers/apache
2022-10-06 19:53:06 +02:00
Simon L
0f8561a920 Merge pull request #1224 from nextcloud/dependabot/docker/Containers/talk/ubuntu-focal-20220922
Bump ubuntu from focal-20220826 to focal-20220922 in /Containers/talk
2022-10-06 19:52:47 +02:00
Simon L
677123e57b Merge pull request #1223 from nextcloud/dependabot/docker/Containers/borgbackup/debian-bullseye-20221004-slim
Bump debian from bullseye-20220912-slim to bullseye-20221004-slim in /Containers/borgbackup
2022-10-06 19:52:24 +02:00
Simon L
e60cffc4cc Merge pull request #1217 from nextcloud/dependabot/docker/Containers/imaginary/nextcloud/imaginary-20221003
Bump nextcloud/imaginary from 20220919 to 20221003 in /Containers/imaginary
2022-10-06 19:51:28 +02:00
Simon L
dced664925 Merge pull request #1216 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.0.24-fpm-alpine3.16
Bump php from 8.0.23-fpm-alpine3.16 to 8.0.24-fpm-alpine3.16 in /Containers/nextcloud
2022-10-06 19:51:01 +02:00
Simon L
ab0856842b Merge pull request #1215 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.0.24-apache-bullseye
Bump php from 8.0.23-apache-bullseye to 8.0.24-apache-bullseye in /Containers/mastercontainer
2022-10-06 19:50:37 +02:00
Simon L
2bd8894454 Merge pull request #1203 from nextcloud/enh/noid/talk-startup-logs
fix talk startup logs
2022-10-06 19:49:51 +02:00
szaimen
b88b55feb4 add channel advice
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-06 18:27:19 +02:00
szaimen
1a2b4217ec nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2022-10-06 12:59:23 +00:00
dependabot[bot]
dd607243d7 Bump debian in /Containers/apache
Bumps debian from bullseye-20220912-slim to bullseye-20221004-slim.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 12:40:33 +00:00
dependabot[bot]
fcabd7cf50 Bump ubuntu from focal-20220826 to focal-20220922 in /Containers/talk
Bumps ubuntu from focal-20220826 to focal-20220922.

---
updated-dependencies:
- dependency-name: ubuntu
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 12:40:30 +00:00
dependabot[bot]
b63f50e00b Bump debian in /Containers/borgbackup
Bumps debian from bullseye-20220912-slim to bullseye-20221004-slim.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-05 12:40:30 +00:00
szaimen
7e235b088f remove codeowners
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-10-03 17:40:52 +02:00
dependabot[bot]
7239360a70 Bump nextcloud/imaginary in /Containers/imaginary
Bumps nextcloud/imaginary from 20220919 to 20221003.

---
updated-dependencies:
- dependency-name: nextcloud/imaginary
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 13:05:56 +00:00
dependabot[bot]
ece09c2f41 Bump php in /Containers/nextcloud
Bumps php from 8.0.23-fpm-alpine3.16 to 8.0.24-fpm-alpine3.16.

---
updated-dependencies:
- dependency-name: php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 12:41:48 +00:00
dependabot[bot]
6e34656540 Bump php in /Containers/mastercontainer
Bumps php from 8.0.23-apache-bullseye to 8.0.24-apache-bullseye.

---
updated-dependencies:
- dependency-name: php
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 12:41:48 +00:00
Simon L
1e8d9809c9 Merge pull request #1208 from nextcloud/aio-dependency-update
Dependency updates
2022-09-28 14:24:15 +02:00
szaimen
27d70b7739 dependency updates
Signed-off-by: GitHub <noreply@github.com>
2022-09-28 12:22:33 +00:00
Simon L
77e6f59610 Merge pull request #1205 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-22.05.6.3.1
Bump collabora/code from 22.05.6.1.1 to 22.05.6.3.1 in /Containers/collabora
2022-09-27 15:02:31 +02:00
szaimen
bce24687cc add Synology Reverse Proxyy to reverse proxy documentation
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-09-27 14:54:49 +02:00
dependabot[bot]
7716548c75 Bump collabora/code in /Containers/collabora
Bumps collabora/code from 22.05.6.1.1 to 22.05.6.3.1.

---
updated-dependencies:
- dependency-name: collabora/code
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-27 12:34:31 +00:00
szaimen
dafa03698b fix talk startup logs
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-09-27 11:28:50 +02:00
Simon L
3645033663 Merge pull request #1188 from nextcloud/dependabot/docker/Containers/apache/caddy-2.6.1-alpine
Bump caddy from 2.5.2-alpine to 2.6.1-alpine in /Containers/apache
2022-09-26 12:30:57 +02:00
Simon L
99838dea4f Merge pull request #1189 from nextcloud/dependabot/docker/Containers/mastercontainer/caddy-2.6.1-alpine
Bump caddy from 2.5.2-alpine to 2.6.1-alpine in /Containers/mastercontainer
2022-09-26 12:30:35 +02:00
szaimen
8889e92a64 fix incorrect removal of OO
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-09-26 12:22:05 +02:00
szaimen
2af13efe63 update some files
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-09-26 12:18:58 +02:00
Simon L
1f58094ddd Merge pull request #1181 from nextcloud/aio-yaml-update
Yaml updates
2022-09-26 12:04:06 +02:00
szaimen
0523af0f8a add a hint that the chosen datadir needs to be cleaned up as well
Signed-off-by: szaimen <szaimen@e.mail.de>
2022-09-25 18:55:07 +02:00
dependabot[bot]
fb8fcae3d6 Bump caddy in /Containers/mastercontainer
Bumps caddy from 2.5.2-alpine to 2.6.1-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-23 12:40:50 +00:00
dependabot[bot]
240a29cb2b Bump caddy from 2.5.2-alpine to 2.6.1-alpine in /Containers/apache
Bumps caddy from 2.5.2-alpine to 2.6.1-alpine.

---
updated-dependencies:
- dependency-name: caddy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-23 12:40:43 +00:00
szaimen
073f5e18e3 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2022-09-21 12:23:29 +00:00
26 changed files with 101 additions and 65 deletions

View File

@@ -1 +0,0 @@
* @szaimen @juliushaertl

View File

@@ -1,7 +1,7 @@
# Caddy is a requirement
FROM caddy:2.5.2-alpine as caddy
FROM caddy:2.6.1-alpine as caddy
FROM debian:bullseye-20220912-slim
FROM debian:bullseye-20221004-slim
RUN mkdir -p /mnt/data; \
chown www-data:www-data /mnt/data;

View File

@@ -2,7 +2,7 @@
curl -skfI localhost:8000 || exit 1
if [ "$APACHE_PORT" != '443' ]; then
curl -skfI localhost:"$APACHE_PORT" || exit 1
nc -z localhost "$APACHE_PORT" || exit 1
else
curl -skfI https://"$NC_DOMAIN":"$APACHE_PORT" || exit 1
nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1
fi

View File

@@ -1,23 +1,23 @@
[supervisord]
nodaemon=true
nodaemon=true
logfile=/var/log/supervisord/supervisord.log
pidfile=/var/run/supervisord/supervisord.pid
childlogdir=/var/log/supervisord/
logfile_maxbytes=50MB
logfile_backups=10
loglevel=error
[program:apache]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=apachectl -DFOREGROUND
[program:caddy]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=/usr/bin/caddy run -config /Caddyfile
[supervisord]
nodaemon=true
nodaemon=true
logfile=/var/log/supervisord/supervisord.log
pidfile=/var/run/supervisord/supervisord.pid
childlogdir=/var/log/supervisord/
logfile_maxbytes=50MB
logfile_backups=10
loglevel=error
[program:apache]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=apachectl -DFOREGROUND
[program:caddy]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=/usr/bin/caddy run --config /Caddyfile

View File

@@ -1,4 +1,4 @@
FROM debian:bullseye-20220912-slim
FROM debian:bullseye-20221004-slim
RUN set -ex; \
\

View File

@@ -1,5 +1,5 @@
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
FROM collabora/code:22.05.6.1.1
FROM collabora/code:22.05.6.3.1
USER root
@@ -9,9 +9,10 @@ RUN set -ex; \
export DEBIAN_FRONTEND=noninteractive; \
apt-get install -y --no-install-recommends \
tzdata \
netcat \
; \
rm -rf /var/lib/apt/lists/*
USER 104
HEALTHCHECK CMD curl -skfI localhost:9980 || exit 1
HEALTHCHECK CMD nc -z localhost 9980 || exit 1

View File

@@ -1,5 +1,5 @@
FROM alpine:3.16.2
RUN apk add --update --no-cache lighttpd bash curl
RUN apk add --update --no-cache lighttpd bash curl netcat-openbsd
RUN adduser -S www-data -G www-data
RUN rm -rf /etc/lighttpd/lighttpd.conf
@@ -15,4 +15,4 @@ USER www-data
RUN mkdir -p /var/www/domaincheck/
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD curl -skfI localhost:$APACHE_PORT || exit 1
HEALTHCHECK CMD nc -z localhost $APACHE_PORT || exit 1

View File

@@ -1,5 +1,5 @@
# From https://github.com/h2non/imaginary/blob/master/Dockerfile
FROM nextcloud/imaginary:20220919
FROM nextcloud/imaginary:20221003
USER root
RUN set -ex; \
@@ -8,8 +8,9 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
netcat \
; \
rm -rf /var/lib/apt/lists/*
USER nobody
HEALTHCHECK CMD curl -skI 127.0.0.1:9000 || exit 1
HEALTHCHECK CMD nc -z localhost 9000 || exit 1

View File

@@ -2,10 +2,10 @@
FROM docker:20.10.18-dind-alpine3.16 as dind
# Caddy is a requirement
FROM caddy:2.5.2-alpine as caddy
FROM caddy:2.6.1-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.0/bullseye/apache/Dockerfile
FROM php:8.0.23-apache-bullseye
FROM php:8.0.24-apache-bullseye
EXPOSE 80
EXPOSE 8080

View File

@@ -1,5 +1,5 @@
#!/bin/bash
if [ -f "/mnt/docker-aio-config/data/configuration.json" ]; then
curl -skfI https://localhost:8080 || exit 1
nc -z localhost 8080 || exit 1
fi

View File

@@ -20,7 +20,7 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=sudo -u www-data /usr/bin/caddy run -config /Caddyfile
command=sudo -u www-data /usr/bin/caddy run --config /Caddyfile
[program:cron]
stdout_logfile=/dev/stdout

View File

@@ -1,5 +1,5 @@
# From https://github.com/nextcloud/docker/blob/master/23/fpm-alpine/Dockerfile
FROM php:8.0.23-fpm-alpine3.16
FROM php:8.0.24-fpm-alpine3.16
# Custom: change id of www-data user as it needs to be the same like on old installations
RUN set -ex; \
@@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html
ENV NEXTCLOUD_VERSION 24.0.5
ENV NEXTCLOUD_VERSION 24.0.6
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
@@ -252,4 +252,4 @@ RUN echo "root:$(openssl rand -base64 12)" | chpasswd
USER www-data
ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD (nc -z localhost 9000 && curl -skI localhost:7867) || exit 1
HEALTHCHECK CMD (nc -z localhost 9000 && nc -z localhost 7867) || exit 1

View File

@@ -382,7 +382,7 @@ if [ "$ONLYOFFICE_ENABLED" = 'yes' ]; then
php /var/www/html/occ config:app:set onlyoffice DocumentServerUrl --value="https://$NC_DOMAIN/onlyoffice"
php /var/www/html/occ config:system:set allow_local_remote_servers --type=bool --value=true
else
if [ -d "/var/www/html/custom_apps/onlyoffice" ]; then
if [ -d "/var/www/html/custom_apps/onlyoffice" ] && [ -n "$ONLYOFFICE_SECRET" ] && [ "$(php /var/www/html/occ config:system:get onlyoffice jwt_secret)" = "$ONLYOFFICE_SECRET" ]; then
php /var/www/html/occ app:remove onlyoffice
fi
fi

View File

@@ -1,4 +1,4 @@
# From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
FROM onlyoffice/documentserver:7.1.1.23
FROM onlyoffice/documentserver:7.2.0.204
HEALTHCHECK CMD curl -skfI localhost || exit 1

View File

@@ -1,4 +1,4 @@
FROM ubuntu:focal-20220826
FROM ubuntu:focal-20220922
RUN set -ex; \
\
@@ -69,4 +69,4 @@ USER talk
ENTRYPOINT ["start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
HEALTHCHECK CMD (curl -skI localhost:8081 && curl -skI localhost:8188 && curl -skf --http0.9 localhost:4222 && nc -z localhost $TALK_PORT) || exit 1
HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost $TALK_PORT) || exit 1

View File

@@ -43,6 +43,8 @@ sed -i 's|#turn_type .*|turn_type = "udp"|g' /etc/janus/janus.jcfg
sed -i 's|#ice_ignore_list .*|ice_ignore_list = "udp"|g' /etc/janus/janus.jcfg
sed -i 's|#interface.*|interface = "lo"|g' /etc/janus/janus.transport.websockets.jcfg
sed -i 's|#ws_interface.*|ws_interface = "lo"|g' /etc/janus/janus.transport.websockets.jcfg
sed -i 's|certfile =|#certfile =|g' /etc/janus/janus.transport.mqtt.jcfg
sed -i 's|keyfile =|#keyfile =|g' /etc/janus/janus.transport.mqtt.jcfg
set +x
# Signling

View File

@@ -27,11 +27,11 @@ stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=/usr/bin/janus --config=/etc/janus/janus.jcfg --disable-colors --daemon --log-stdout
command=/usr/bin/janus --config=/etc/janus/janus.jcfg --disable-colors --log-stdout
[program:signaling]
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=signaling -config /etc/signaling/server.conf
command=signaling --config /etc/signaling/server.conf

View File

@@ -17,6 +17,8 @@ services:
- TALK_HOST=nextcloud-aio-talk
- APACHE_PORT=${APACHE_PORT}
- TZ=${TIMEZONE}
- APACHE_MAX_SIZE=${APACHE_MAX_SIZE}
- APACHE_MAX_TIME=${NEXTCLOUD_MAX_TIME}
volumes:
- nextcloud_aio_nextcloud:/var/www/html:ro
- nextcloud_aio_apache:/mnt/data:rw
@@ -54,6 +56,7 @@ services:
- nextcloud_aio_nextcloud:/var/www/html:rw
- ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw
- ${NEXTCLOUD_MOUNT}:${NEXTCLOUD_MOUNT}:rw
- ${TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro
environment:
- POSTGRES_HOST=nextcloud-aio-database
- POSTGRES_PASSWORD=${DATABASE_PASSWORD}
@@ -84,6 +87,7 @@ services:
- FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED}
- FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch
- PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME}
- TRUSTED_CACERTS_DIR=${TRUSTED_CACERTS_DIR}
stop_grace_period: 10s
restart: unless-stopped
networks:
@@ -105,7 +109,7 @@ services:
image: nextcloud/aio-collabora:latest-arm64
environment:
- aliasgroup1=https://${NC_DOMAIN}:443
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY}
- dictionaries=${COLLABORA_DICTIONARIES}
- TZ=${TIMEZONE}
stop_grace_period: 10s

View File

@@ -19,6 +19,8 @@ services:
- APACHE_PORT=${APACHE_PORT}
- ONLYOFFICE_HOST=nextcloud-aio-onlyoffice
- TZ=${TIMEZONE}
- APACHE_MAX_SIZE=${APACHE_MAX_SIZE}
- APACHE_MAX_TIME=${NEXTCLOUD_MAX_TIME}
volumes:
- nextcloud_aio_nextcloud:/var/www/html:ro
- nextcloud_aio_apache:/mnt/data:rw
@@ -57,6 +59,7 @@ services:
- nextcloud_aio_nextcloud:/var/www/html:rw
- ${NEXTCLOUD_DATADIR}:/mnt/ncdata:rw
- ${NEXTCLOUD_MOUNT}:${NEXTCLOUD_MOUNT}:rw
- ${TRUSTED_CACERTS_DIR}:/usr/local/share/ca-certificates:ro
environment:
- POSTGRES_HOST=nextcloud-aio-database
- POSTGRES_PASSWORD=${DATABASE_PASSWORD}
@@ -92,6 +95,7 @@ services:
- FULLTEXTSEARCH_ENABLED=${FULLTEXTSEARCH_ENABLED}
- FULLTEXTSEARCH_HOST=nextcloud-aio-fulltextsearch
- PHP_MAX_TIME=${NEXTCLOUD_MAX_TIME}
- TRUSTED_CACERTS_DIR=${TRUSTED_CACERTS_DIR}
stop_grace_period: 10s
restart: unless-stopped
networks:
@@ -113,7 +117,7 @@ services:
image: nextcloud/aio-collabora:latest
environment:
- aliasgroup1=https://${NC_DOMAIN}:443
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true
- extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.level=warning --o:home_mode.enable=true ${COLLABORA_SECCOMP_POLICY}
- dictionaries=${COLLABORA_DICTIONARIES}
- TZ=${TIMEZONE}
stop_grace_period: 10s

View File

@@ -1,9 +1,11 @@
AIO_TOKEN=123456 # Has no function but needs to be set!
AIO_URL=localhost # Has no function but needs to be set!
APACHE_MAX_SIZE=10737418240 # This needs to be an integer and in sync with NEXTCLOUD_UPLOAD_LIMIT
APACHE_PORT=443 # Changing this to a different value than 443 will allow you to run it behind a reverse proxy.
CLAMAV_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
COLLABORA_DICTIONARIES=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru # You can change this in order to enable other dictionaries for collabora
COLLABORA_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically.
COLLABORA_SECCOMP_POLICY=--o:security.seccomp=true # Changing the value to false allows to disable the seccomp feature of the Collabora container.
DATABASE_PASSWORD= # TODO! This needs to be a unique and good password!
FULLTEXTSEARCH_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
IMAGINARY_ENABLED=no # Setting this to "yes" enables the option in Nextcloud automatically.
@@ -21,5 +23,6 @@ SIGNALING_SECRET= # TODO! This needs to be a unique and good password!
TALK_ENABLED=yes # Setting this to "yes" enables the option in Nextcloud automatically.
TALK_PORT=3478 # This allows to adjust the port that the talk container is using.
TIMEZONE=Europe/Berlin # TODO! This is the timezone that your containers will use.
TRUSTED_CACERTS_DIR=/path/to/my/cacerts # Nextcloud container will trust all the Certification Authorities, whose certificates are included in the given directory.
TURN_SECRET= # TODO! This needs to be a unique and good password!
UPDATE_NEXTCLOUD_APPS=no # When setting to yes, it will automatically update all installed Nextcloud apps upon container startup on saturdays.

View File

@@ -123,9 +123,5 @@ sed -i '/image:/s/$/:latest-arm64/' latest-arm64.yml
sed -i '/ nextcloud-aio-clamav:/,/^ $/d' latest-arm64.yml
sed -i '/nextcloud[-_]aio[-_]clamav/d' latest-arm64.yml
sed -i '/CLAMAV_ENABLED/d' latest-arm64.yml
sed -i '/ nextcloud-aio-onlyoffice:/,/^ $/d' latest-arm64.yml
sed -i '/nextcloud[-_]aio[-_]onlyoffice/d' latest-arm64.yml
sed -i '/ONLYOFFICE_ENABLED/d' latest-arm64.yml
sed -i '/ONLYOFFICE_SECRET/d' latest-arm64.yml
rm containers.yml

12
php/composer.lock generated
View File

@@ -1686,16 +1686,16 @@
},
{
"name": "twig/twig",
"version": "v3.4.2",
"version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077"
"reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077",
"reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58",
"reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58",
"shasum": ""
},
"require": {
@@ -1746,7 +1746,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.4.2"
"source": "https://github.com/twigphp/Twig/tree/v3.4.3"
},
"funding": [
{
@@ -1758,7 +1758,7 @@
"type": "tidelift"
}
],
"time": "2022-08-12T06:47:24+00:00"
"time": "2022-09-28T08:42:51+00:00"
}
],
"packages-dev": [],

View File

@@ -439,6 +439,10 @@ class ConfigurationManager
if(!is_dir(DataConst::GetDataDirectory())) {
throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not exist! Something was set up falsely!");
}
$df = disk_free_space(DataConst::GetDataDirectory());
if ($df !== false && (int)$df < 10240) {
throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not have enough space for writing the config file! Not writing it back!");
}
file_put_contents(DataConst::GetConfigFile(), json_encode($config));
}

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v2.0.3</h1>
<h1>Nextcloud AIO v2.0.4</h1>
{% set isAnyRunning = false %}
{% set isAnyRestarting = false %}
@@ -167,7 +167,11 @@
{% endif %}
{% if domain != "" and was_start_button_clicked == true %}
{% if current_channel starts with 'latest' or current_channel starts with 'beta' or current_channel starts with 'develop' %}
You are running the <a href="https://github.com/nextcloud/all-in-one#how-to-switch-the-channel"><b>{{ current_channel }}</b></a> channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
{% else %}
No channel was found. This means that AIO is not able to update itself and its component and will also not be able to report about updates. Updates need to be done externally.
{% endif %}
{% endif %}
{% if is_backup_container_running == true %}
@@ -483,20 +487,20 @@
<input type="checkbox" id="talk" name="talk"><label for="talk">Nextcloud Talk (needs ports {{ talk_port }}/TCP and {{ talk_port }}/UDP open in your firewall/router)</label><br><br>
{% endif %}
{% if is_onlyoffice_enabled == true %}
<input type="checkbox" id="onlyoffice" name="onlyoffice" checked="checked"><label for="onlyoffice">OnlyOffice (only supported on x64)</label><br>
<input type="checkbox" id="onlyoffice" name="onlyoffice" checked="checked"><label for="onlyoffice">OnlyOffice</label><br>
{% else %}
{#<input type="checkbox" id="onlyoffice" name="onlyoffice"><label for="onlyoffice">OnlyOffice (only supported on x64)</label><br>#}
{#<input type="checkbox" id="onlyoffice" name="onlyoffice"><label for="onlyoffice">OnlyOffice</label><br>#}
{% endif %}
<input id="options-form-submit" class="button" type="submit" value="Save changes" />
</form>
<b>Minimal system requirements:</b> When any optional addon is enabled, at least 2GB RAM, a dual-core CPU and 40GB system storage are required. When enabling ClamAV or Fulltextsearch, at least 3GB RAM are required. When enabling everything, at least 4GB RAM are required. Recommended are at least 1GB more RAM than the minimal requirement.<br><br>
{% if isAnyRunning == true or is_x64_platform == false %}
<script type="text/javascript" src="disable-clamav.js"></script>
<script type="text/javascript" src="disable-onlyoffice.js"></script>
{% endif %}
{% if isAnyRunning == true %}
<script type="text/javascript" src="disable-talk.js"></script>
<script type="text/javascript" src="disable-collabora.js"></script>
<script type="text/javascript" src="disable-onlyoffice.js"></script>
<script type="text/javascript" src="disable-imaginary.js"></script>
<script type="text/javascript" src="disable-fulltextsearch.js"></script>
{% endif %}

View File

@@ -196,7 +196,7 @@ Here is how to reset the AIO instance properly:
1. Now remove all these stopped containers with `sudo docker container prune`
1. Delete the docker network with `sudo docker network rm nextcloud-aio`
1. Check which volumes are dangling with `sudo docker volume ls --filter "dangling=true"`
1. Now remove all these dangling volumes: `sudo docker volume prune` (on Windows you might need to remove some volumes afterwards manually with `docker volume rm nextcloud_aio_backupdir`, `docker volume rm nextcloud_aio_nextcloud_datadir`)
1. Now remove all these dangling volumes: `sudo docker volume prune` (on Windows you might need to remove some volumes afterwards manually with `docker volume rm nextcloud_aio_backupdir`, `docker volume rm nextcloud_aio_nextcloud_datadir`). Also if you've configured `NEXTCLOUD_DATADIR` to a path on your host instead of the default volume, you need to clean that up as well.
1. Optional: You can remove all docker images with `sudo docker image prune -a`.
1. And you are done! Now feel free to start over with the recommended docker run command!

View File

@@ -203,6 +203,24 @@ Of course you need to modify `<your-nc-domain>` to the domain on which you want
</details>
### Synology Reverse Proxy
<details>
<summary>click here to expand</summary>
**Disclaimer:** It might be possible that the config below is not working 100% correctly, yet. Improvements to it are very welcome!
See these screenshots for a working config:
![image](https://user-images.githubusercontent.com/89748315/192525606-48cab54b-866e-4964-90a8-15e71bd362fb.png)
![image](https://user-images.githubusercontent.com/89748315/192525681-c06f3b39-f510-458e-b1f2-6b2cd995e24c.png)
Of course you need to modify `<your-nc-domain>` to the domain on which you want to run Nextcloud. Also make sure to adjust the port 11000 to match the chosen APACHE_PORT. **Please note:** The above configuration will only work if your reverse proxy is running directly on the host that is running the docker daemon. If the reverse proxy is running in a docker container, you can use the `--network host` option (or `network_mode: host` for docker-compose) when starting the reverse proxy container in order to connect the reverse proxy container to the host network. If that is not an option for you, you can alternatively instead of `localhost` use the ip-address that is displayed after running the following command on the host OS: `ip a | grep "scope global" | head -1 | awk '{print $2}' | sed 's|/.*||'` (the command only works on Linux)
</details>
### Traefik 2
<details>