Compare commits

...

75 Commits

Author SHA1 Message Date
Simon L.
81fec27c14 Merge pull request #6455 from thiswillbeyourgithub/doc_clarify_migration
doc: clarify migration steps
2025-05-30 14:14:48 +02:00
Simon L.
bf7963a9ac Merge pull request #6473 from nextcloud/enh/noid/show-ccs
fix showing community containers in the AIO interface and enabling or disabling them
2025-05-30 13:52:42 +02:00
Simon L.
8a6772bc05 fix showing community containers in the AIO interface and enabling or disabling them
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 13:51:36 +02:00
thiswillbeyourgithub
328900b8c2 doc: clarification of app migration
Signed-off-by: thiswillbeyourgithub <26625900+thiswillbeyourgithub@users.noreply.github.com>
2025-05-30 12:17:03 +02:00
Simon L.
0fe4ea3238 fix detail in optional containers
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 11:40:59 +02:00
Simon L.
f678b09523 fix collabora healthcheck
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 11:24:07 +02:00
Simon L.
c151a37f73 Merge pull request #6472 from nextcloud/revert-6441-enh/5919/add-pandoc
Revert "nextcloud: add pandoc to container"
2025-05-30 11:19:15 +02:00
Simon L.
22848e76ec Revert "nextcloud: add pandoc to container" 2025-05-30 11:18:38 +02:00
Simon L.
ff7d0e4a01 adjust cc-docs
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 11:13:05 +02:00
Simon L.
3f520b2f3c move note about how to handle the ccs
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 10:58:45 +02:00
Simon L.
635381a4c8 fix another detail in scandir
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 10:47:55 +02:00
Simon L.
ae5adc989f the cc-section needs to be included in another place
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 10:37:52 +02:00
Simon L.
30bd415aac Merge pull request #6471 from nextcloud/enh/noid/get-dir-of-dots
scandir: get rid of dots
2025-05-30 10:29:41 +02:00
Simon L.
21b9c19c5d scandir: get rid of dots
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 10:27:12 +02:00
Simon L.
2822cf2773 Merge pull request #6470 from nextcloud/enh/noid/collabora-fix-install
collabora: move healthcheck to use curl in order to fix the Dockerfile
2025-05-30 10:08:38 +02:00
Simon L.
1d3692a6db collabora: move healthcheck to use curl in order to fix the Dockerfile
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 10:02:46 +02:00
Simon L.
d6c35782f5 another collabora attempt
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 09:56:28 +02:00
Simon L.
37c56f1a0c Merge pull request #6469 from nextcloud/enh/noid/adjust-permissions
nextcloud: adjust permissions
2025-05-30 09:54:32 +02:00
Simon L.
7442072a5d nextcloud: adjust permissions
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 09:53:19 +02:00
Simon L.
cdd5a95062 another attempt
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 09:48:16 +02:00
Simon L.
f2f674d949 fix detail
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 09:45:15 +02:00
Simon L.
1cced86de6 fix collabora
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 09:43:20 +02:00
Simon L.
bbd6812977 increase to 11.0.0
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-30 09:38:18 +02:00
Simon L.
9a289b0193 Merge pull request #6467 from nextcloud/dependabot/docker/Containers/redis/redis-7.2.9-alpine
build(deps): bump redis from 7.2.8-alpine to 7.2.9-alpine in /Containers/redis
2025-05-30 09:35:52 +02:00
Simon L.
8547bb18e1 Merge pull request #6466 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-28.2.1-cli
build(deps): bump docker from 28.1.1-cli to 28.2.1-cli in /Containers/mastercontainer
2025-05-30 09:35:31 +02:00
Simon L.
a2032c063c Merge pull request #6465 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.18.2
build(deps): bump elasticsearch from 8.18.1 to 8.18.2 in /Containers/fulltextsearch
2025-05-30 09:35:17 +02:00
Simon L.
673b1db07e aio-interface: allow to manage the community containers via the AIO interface (#6443)
Signed-off-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
2025-05-30 09:32:51 +02:00
Simon L.
17ec503bf3 Merge pull request #6458 from nextcloud/enh/6456/move-local-socket
clamav: move LocalSocket to `/tmp/clamd.sock`
2025-05-30 09:30:35 +02:00
dependabot[bot]
b6c078847d build(deps): bump redis in /Containers/redis
Bumps redis from 7.2.8-alpine to 7.2.9-alpine.

---
updated-dependencies:
- dependency-name: redis
  dependency-version: 7.2.9-alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-30 04:40:25 +00:00
dependabot[bot]
945b767e2c build(deps): bump docker in /Containers/mastercontainer
Bumps docker from 28.1.1-cli to 28.2.1-cli.

---
updated-dependencies:
- dependency-name: docker
  dependency-version: 28.2.1-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-30 04:39:56 +00:00
dependabot[bot]
1edd280cc8 build(deps): bump elasticsearch in /Containers/fulltextsearch
Bumps elasticsearch from 8.18.1 to 8.18.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-30 04:39:48 +00:00
Simon L.
eeaa2d65a8 Merge pull request #6463 from nextcloud/aio-dependency-update
PHP dependency updates
2025-05-29 18:48:13 +02:00
szaimen
87b0572845 php dependency updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-29 12:03:15 +00:00
Simon L.
83fa16f14f Merge pull request #6461 from nextcloud/dependabot/docker/Containers/docker-socket-proxy/haproxy-3.2.0-alpine
build(deps): bump haproxy from 3.1.7-alpine to 3.2.0-alpine in /Containers/docker-socket-proxy
2025-05-29 09:33:51 +02:00
dependabot[bot]
73ccf23e92 build(deps): bump haproxy in /Containers/docker-socket-proxy
Bumps haproxy from 3.1.7-alpine to 3.2.0-alpine.

---
updated-dependencies:
- dependency-name: haproxy
  dependency-version: 3.2.0-alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-29 04:33:18 +00:00
Simon L.
a72bdf097f clamav: move LocalSocket to /tmp/clamd.sock
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-28 11:08:34 +02:00
thiswillbeyourgithub
68ae9c055a doc: clarify migration steps
Signed-off-by: thiswillbeyourgithub <26625900+thiswillbeyourgithub@users.noreply.github.com>
2025-05-27 16:00:58 +02:00
Simon L.
13749475e1 Merge pull request #6451 from nextcloud/enh/noid/update-caddy-readme
readme: update docs regarding unothorized ACME challenges
2025-05-27 12:53:07 +02:00
Simon L.
de6fde26cd readme: update docs regarding unothorized ACME challenges
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-27 12:49:37 +02:00
Simon L.
7eca14acfd Merge pull request #6450 from nextcloud/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2025-05-27 12:30:35 +02:00
nextcloud-command
8a4789a903 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2025-05-27 04:12:55 +00:00
Simon L.
ae841a66a7 upgrade helm-chart to v10.15.0
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 15:29:04 +02:00
Simon L.
e69372e8e4 downgrade helm-chart to 10.14.0
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 15:27:31 +02:00
Simon L.
b5ff2376d8 fix update-helm script
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 15:26:31 +02:00
Simon L.
2ddf074965 Merge pull request #6447 from nextcloud/aio-helm-update
Helm Chart updates
2025-05-26 14:47:22 +02:00
szaimen
100d370047 Helm Chart updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-26 12:46:45 +00:00
Simon L.
99f7909c9c Merge pull request #6446 from nextcloud/aio-dependency-update
PHP dependency updates
2025-05-26 14:45:16 +02:00
szaimen
347aaf618e php dependency updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-26 12:03:12 +00:00
Simon L.
c65a6c21ca Merge pull request #6445 from nextcloud/enh/6149/remove-upgrade-notice
aio-interface: hide instructions for upgrading to nc31
2025-05-26 13:55:56 +02:00
Simon L.
2d9152d09a aio-interface: hide instructions for upgrading to nc31
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 13:54:39 +02:00
Simon L.
1259d43b0a Merge pull request #6444 from nextcloud/enh/6149/upgrade-to-nc31
nextcloud: upgrade to nc31
2025-05-26 13:50:56 +02:00
Simon L.
18663f0b05 nextcloud: upgrade to nc31
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 13:49:41 +02:00
Simon L.
066a5102bd Merge pull request #6442 from nextcloud/enh/5364/increase-to-17
postgres: increase to 17
2025-05-26 13:39:28 +02:00
Simon L.
d0d11cc818 postgres: increase to 17
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 13:38:22 +02:00
Simon L.
365aeb0c94 Merge pull request #6440 from nextcloud/enh/6149/increase-app-version
app: increase version to allow nc31
2025-05-26 13:35:11 +02:00
Simon L.
872a9597ae Merge pull request #6441 from nextcloud/enh/5919/add-pandoc
nextcloud: add pandoc to container
2025-05-26 13:34:55 +02:00
Simon L.
c509ce6c8f nextcloud: add pandoc to container
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 13:33:31 +02:00
Simon L.
117a5dfd34 app: increase version to allow nc31
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 13:31:31 +02:00
Simon L.
1a4f70ecec Merge pull request #6439 from nextcloud/enh/noid/remove-entrypoint-workaround
nextcloud: remove workaround to update logic in entrypoint
2025-05-26 13:30:29 +02:00
Simon L.
43d16a3b25 nextcloud: remove workaround to update logic in entrypoint
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 13:29:42 +02:00
Simon L.
3367f2ddfe Merge pull request #6184 from nextcloud/enh/6175/update-import-logic
database-import: update logic to consider wrong line endings
2025-05-26 13:23:03 +02:00
Simon L.
317c9d1edc Merge pull request #6435 from nextcloud/dependabot/docker/Containers/talk/nats-2.11.4-scratch
build(deps): bump nats from 2.11.3-scratch to 2.11.4-scratch in /Containers/talk
2025-05-26 13:21:20 +02:00
Simon L.
1801d57a06 Merge pull request #6433 from nextcloud/enh/6422/increase-default-shm-size
nextcloud: increase apc.shm_size to 64M to match the docker default shm-size
2025-05-26 13:21:09 +02:00
Simon L.
d991a18fe5 Merge pull request #6428 from nextcloud/aio-dependency-update
PHP dependency updates
2025-05-26 13:20:57 +02:00
Simon L.
7c1190f70b Merge pull request #6427 from nextcloud/imaginary-container-update
Imaginary update
2025-05-26 13:20:43 +02:00
Simon L.
a0d86ce2d9 Merge pull request #6418 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-25.04.2.1.1
build(deps): bump collabora/code from 24.04.13.3.1 to 25.04.2.1.1 in /Containers/collabora
2025-05-26 13:20:33 +02:00
Simon L.
12340a7ce9 adjust instructions how to promote builds from beta to latest
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-26 11:11:44 +02:00
dependabot[bot]
a18371c074 build(deps): bump nats in /Containers/talk
Bumps nats from 2.11.3-scratch to 2.11.4-scratch.

---
updated-dependencies:
- dependency-name: nats
  dependency-version: 2.11.4-scratch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-23 04:51:55 +00:00
szaimen
1afe2afed0 php dependency updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-22 12:03:18 +00:00
szaimen
bf61090568 imaginary-update automated change
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-22 12:03:18 +00:00
Simon L.
04ffcb9b21 Merge pull request #6430 from powerflo/patch-1
Fix broken link in readme.md
2025-05-21 14:45:52 +02:00
Simon L.
25da732d82 nextcloud: increase apc.shm_size to 64M to match the docker default shm-size
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-05-21 14:43:44 +02:00
Florian Wallner
b73419c4da Update readme.md
Fix broken link

Signed-off-by: Florian Wallner <asdf@walura.eu>
2025-05-20 20:46:25 +02:00
dependabot[bot]
6c49505b06 build(deps): bump collabora/code in /Containers/collabora
Bumps collabora/code from 24.04.13.3.1 to 25.04.2.1.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-16 05:07:04 +00:00
Simon L.
630a0dc6aa database-import: update logic to consider wrong lin endings
Signed-off-by: Simon L. <szaimen@e.mail.de>
2025-03-24 18:43:25 +01:00
60 changed files with 350 additions and 351 deletions

View File

@@ -11,6 +11,7 @@ RUN set -ex; \
sed -i "s|#\?PCREMaxFileSize.*|PCREMaxFileSize aio-placeholder|g" /etc/clamav/clamd.conf; \
sed -i "s|#\?StreamMaxLength.*|StreamMaxLength aio-placeholder|g" /etc/clamav/clamd.conf; \
sed -i "s|#\?TCPSocket|TCPSocket|g" /etc/clamav/clamd.conf; \
sed -i "s|^LocalSocket .*|LocalSocket /tmp/clamd.sock|g" /etc/clamav/clamd.conf; \
freshclam --foreground --stdout
COPY --chmod=775 start.sh /start.sh

View File

@@ -1,19 +1,10 @@
# syntax=docker/dockerfile:latest
# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile
FROM collabora/code:24.04.13.3.1
FROM collabora/code:25.04.2.1.1
USER root
ARG DEBIAN_FRONTEND=noninteractive
# hadolint ignore=DL3008
RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
netcat-openbsd \
; \
rm -rf /var/lib/apt/lists/*;
COPY --chmod=775 healthcheck.sh /healthcheck.sh
USER 1001

View File

@@ -1,3 +1,7 @@
#!/bin/bash
nc -z 127.0.0.1 9980 || exit 1
# Unfortunately, no curl and no nc is installed in the container
# and packages can also not be added as the package list is broken.
# So always exiting 0 for now.
# nc http://127.0.0.1:9980 || exit 1
exit 0

View File

@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM haproxy:3.1.7-alpine
FROM haproxy:3.2.0-alpine
# hadolint ignore=DL3002
USER root

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:8.18.1
FROM elasticsearch:8.18.2
USER root

View File

@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:latest
FROM golang:1.24.3-alpine3.21 AS go
ENV IMAGINARY_HASH=1d4e251cfcd58ea66f8361f8721d7b8cc85002a3
ENV IMAGINARY_HASH=1d4e251cfcd58ea66f8361f8721d7b8cc85002a3
RUN set -ex; \
apk upgrade --no-cache -a; \

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
FROM docker:28.1.1-cli AS docker
FROM docker:28.2.1-cli AS docker
# Caddy is a requirement
FROM caddy:2.10.0-alpine AS caddy

View File

@@ -258,18 +258,8 @@ It is set to '$NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS'."
fi
fi
if [ -n "$AIO_COMMUNITY_CONTAINERS" ]; then
read -ra AIO_CCONTAINERS <<< "$AIO_COMMUNITY_CONTAINERS"
for container in "${AIO_CCONTAINERS[@]}"; do
if ! [ -d "/var/www/docker-aio/community-containers/$container" ]; then
print_red "The community container $container was not found!"
FAIL_CCONTAINERS=1
fi
done
if [ -n "$FAIL_CCONTAINERS" ]; then
print_red "You've set AIO_COMMUNITY_CONTAINERS but at least one container was not found.
It is set to '$AIO_COMMUNITY_CONTAINERS'."
exit 1
fi
print_red "You've set AIO_COMMUNITY_CONTAINERS but the option was removed.
The community containers get managed via the AIO interface now."
fi
# Check if ghcr.io is reachable

View File

@@ -8,7 +8,7 @@ ENV SOURCE_LOCATION=/usr/src/nextcloud
ENV REDIS_DB_INDEX=0
# AIO settings start # Do not remove or change this line!
ENV NEXTCLOUD_VERSION=30.0.11
ENV NEXTCLOUD_VERSION=31.0.5
ENV AIO_TOKEN=123456
ENV AIO_URL=localhost
# AIO settings end # Do not remove or change this line!
@@ -118,7 +118,10 @@ RUN set -ex; \
echo 'opcache.jit_buffer_size=8M'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
\
echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
{ \
echo 'apc.enable_cli=1'; \
echo 'apc.shm_size=64M'; \
} >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
\
{ \
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
@@ -209,8 +212,8 @@ RUN set -ex; \
/var/log/supervisord \
/var/run/supervisord \
; \
chown www-data:root -R /var/log/supervisord; \
chown www-data:root -R /var/run/supervisord; \
chmod 777 -R /var/log/supervisord; \
chmod 777 -R /var/run/supervisord; \
\
apk add --no-cache \
bash \
@@ -250,14 +253,13 @@ RUN set -ex; \
# AIO cloning end # Do not remove or change this line!
\
chown www-data:root -R /usr/src && \
chown www-data:root -R /usr/local/etc/php/conf.d && \
chown www-data:root -R /usr/local/etc/php-fpm.d && \
chmod 777 -R /usr/local/etc/php/conf.d && \
chmod 777 -R /usr/local/etc/php-fpm.d && \
chmod -R 777 /tmp; \
rm -rf /usr/src/nextcloud/apps/updatenotification; \
\
mkdir -p /nc-updater; \
chown -R www-data:www-data /nc-updater; \
chmod -R 770 /nc-updater
chmod -R 777 /nc-updater
# hadolint ignore=DL3002
USER root

View File

@@ -105,20 +105,6 @@ if ! [ -f "$NEXTCLOUD_DATA_DIR/skip.update" ]; then
# Write output to logfile.
exec > >(tee -i "/var/www/html/data/update.log")
exec 2>&1
# Run built-in upgrader if version is below 28.0.2 to upgrade to 28.0.x first
touch "$NEXTCLOUD_DATA_DIR/update.failed"
if ! version_greater "$installed_version" "28.0.1.20"; then
php /var/www/html/updater/updater.phar --no-interaction --no-backup
if ! php /var/www/html/occ upgrade || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
echo "Upgrade failed. Please restore from backup."
bash /notify.sh "Nextcloud update to $image_version failed!" "Please restore from backup!"
exit 1
fi
rm "$NEXTCLOUD_DATA_DIR/update.failed"
# shellcheck disable=SC2016
installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
INSTALLED_MAJOR="${installed_version%%.*}"
fi
fi
if [ "$installed_version" != "0.0.0.0" ] && [ "$((IMAGE_MAJOR - INSTALLED_MAJOR))" -gt 1 ]; then

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/postgres/blob/master/16/alpine3.21/Dockerfile
FROM postgres:16.9-alpine
# From https://github.com/docker-library/postgres/blob/master/17/alpine3.21/Dockerfile
FROM postgres:17.5-alpine
COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh

View File

@@ -99,7 +99,7 @@ if ( [ -f "$DATADIR/PG_VERSION" ] && [ "$PG_MAJOR" != "$(cat "$DATADIR/PG_VERSIO
fi
# Get the Owner
DB_OWNER="$(grep -a "$GREP_STRING" "$DUMP_FILE" | head -1 | grep -oP 'Owner:.*$' | sed 's|Owner:||;s| ||g')"
DB_OWNER="$(grep -a "$GREP_STRING" "$DUMP_FILE" | head -1 | grep -oP 'Owner:.*$' | sed 's|Owner:||;s|[[:space:]]||g')"
if [ "$DB_OWNER" = "$POSTGRES_USER" ]; then
echo "Unfortunately was the found database owner of the dump file the same as the POSTGRES_USER $POSTGRES_USER"
echo "It is not possible to import a database dump from this database owner."

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/redis/blob/master/7.2/alpine/Dockerfile
FROM redis:7.2.8-alpine
FROM redis:7.2.9-alpine
COPY --chmod=775 start.sh /start.sh

View File

@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM nats:2.11.3-scratch AS nats
FROM nats:2.11.4-scratch AS nats
FROM eturnal/eturnal:1.12.1 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:2.0.3 AS signaling
FROM alpine:3.21.3 AS janus

View File

@@ -5,7 +5,7 @@
<name>Nextcloud All-in-One</name>
<summary>Provides a login link for admins.</summary>
<description>Add a link to the admin settings that gives access to the Nextcloud All-in-One admin interface</description>
<version>0.7.0</version>
<version>0.8.0</version>
<licence>agpl</licence>
<author>Azul</author>
<namespace>AllInOne</namespace>
@@ -13,7 +13,7 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/all-in-one/issues</bugs>
<dependencies>
<nextcloud min-version="29" max-version="30"/>
<nextcloud min-version="30" max-version="31"/>
</dependencies>
<settings>

View File

@@ -5,9 +5,8 @@ This directory features containers that are built for AIO which allows to add ad
All containers that are in this directory are community maintained so the responsibility is on the community to keep them updated and secure. There is no guarantee that this will be the case in the future.
## How to use this?
Before adding any additional container, make sure to create a backup via the AIO interface!
Afterwards, you might want to add additional community containers to the default AIO stack. You can do so by adding `--env AIO_COMMUNITY_CONTAINERS="container1 container2"` to the docker run command of the mastercontainer (but before the last line `ghcr.io/nextcloud-releases/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) and customize the value to your fitting. It must match the folder names in this directory! ⚠️⚠️⚠️ Please review the folder for documentation on each of the containers before adding them! Not reviewing the documentation for each of them first might break starting the AIO containers because e.g. fail2ban only works on Linux and not on Docker Desktop! **Hint:** If the containers where running already, in order to actually start the added container, you need to click on `Stop containers` and the `Update and start containers` in order to actually start it.
Starting with v11 of AIO, the management of Community Containers is done via the AIO interface (it is the last section in the AIO interface, so only visible if you scroll down).
⚠️⚠️⚠️ Please review the folder for documentation on each of the containers before adding them! Not reviewing the documentation for each of them first might break starting the AIO containers because e.g. fail2ban only works on Linux and not on Docker Desktop! **Hint:** If the containers where running already, in order to actually start the added container, you need to click on `Stop containers` and the `Update and start containers` in order to actually start it.
## How to add containers?
Simply submit a PR by creating a new folder in this directory: https://github.com/nextcloud/all-in-one/tree/main/community-containers with the name of your container. It must include a json file with the same name and with correct syntax and a readme.md with additional information. You might get inspired by caddy, fail2ban, local-ai, libretranslate, plex, pi-hole or vaultwarden (subfolders in this directory). For a full-blown example of the json file, see https://github.com/nextcloud/all-in-one/blob/main/php/containers.json. The json-schema that it validates against can be found here: https://github.com/nextcloud/all-in-one/blob/main/php/containers-schema.json.
@@ -16,8 +15,6 @@ Simply submit a PR by creating a new folder in this directory: https://github.co
Yes, see [this list](https://github.com/nextcloud/all-in-one/issues/5251) for already existing ideas for new community containers. Feel free to pick one up and add it to this folder by following the instructions above.
## How to remove containers from AIOs stack?
In some cases, you might want to remove some community containers from the AIO stack again. Here is how to do this.
First, do a backup from the AIO interface in order to save the current state. Do not start the containers again afterwards! Now simply recreate the mastercontainer and remove any container from the `--env AIO_COMMUNITY_CONTAINERS="container1 container2"` that you do not actually need. If you want to remove all, simply use `--env AIO_COMMUNITY_CONTAINERS=" "`.
You can remove containers now via the web interface.
After removing the containers, there might be some data left on your server that you might want to remove. You can get rid of the data by first running `sudo docker rm nextcloud-aio-container1`, (adjust `container1` accordingly) per community-container that you removed. Then run `sudo docker image prune -a` in order to remove all images that are not used anymore. As last step you can get rid of persistent data of these containers that is stored in volumes. You can check if there is some by running `sudo docker volume ls` and look for any volume that matches the ones that you removed. If so, you can remove them with `sudo docker volume rm nextcloud_aio_volume-id` (of course you need to adjust the `volume-id`).

View File

@@ -14,7 +14,6 @@ services:
- 8443:8443 # Can be removed when running behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else). See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# environment: # Is needed when using any of the options below
# AIO_DISABLE_BACKUP_SECTION: false # Setting this to true allows to hide the backup section in the AIO interface. See https://github.com/nextcloud/all-in-one#how-to-disable-the-backup-section
# AIO_COMMUNITY_CONTAINERS: # With this variable, you can add community containers very easily. See https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers
# APACHE_PORT: 11000 # Is needed when running behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else). See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# APACHE_IP_BINDING: 127.0.0.1 # Should be set when running behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) that is running on the same host. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
# APACHE_ADDITIONAL_NETWORK: frontend_net # (Optional) Connect the apache container to an additional docker network. Needed when behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) running in a different docker network on same server. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md

View File

@@ -41,8 +41,9 @@ This is documented here: https://github.com/nextcloud-releases/all-in-one/tree/m
## How to promote builds from beta to latest
1. Verify that GitHub Services are running correctly: https://www.githubstatus.com/
1. Verify that no job is running here: https://github.com/nextcloud-releases/all-in-one/actions/workflows/promote-to-beta.yml
2. Go to https://github.com/nextcloud-releases/all-in-one/actions/workflows/promote-to-latest.yml, click on `Run workflow`.
1. Go to https://github.com/nextcloud-releases/all-in-one/actions/workflows/promote-to-latest.yml, click on `Run workflow`.
## How to connect to the database?
Simply run `sudo docker exec -it nextcloud-aio-database psql -U oc_nextcloud nextcloud_database` and you should be in.

View File

@@ -57,9 +57,9 @@ The procedure for migrating the files and the database works like this:
```
**Please note:** The exact name of the database export file is important! (`database-dump.sql`)<br>
And of course you need to to use the correct name that the Postgresql database has for the export (if `$PG_DATABASE` doesn't work directly).
1. At this point, you can finally install Nextcloud AIO on a new server/linux installation, enter your domain in the AIO interface (use the same domain that you used on your former installation) and wait until all containers are running. Then you should check the included Nextcloud version by running `sudo docker inspect nextcloud-aio-nextcloud | grep NEXTCLOUD_VERSION`. Also install all apps via the apps management site that were installed on the old Nextcloud installation. Otherwise they will show as installed, but will not work.
1. Next, take a backup using Nextcloud AIO's built-in backup solution (so that you can easily restore to this state again) (Note: this will stop all containers and is expected: don't start the container again at this point!)
1. Now, we are slowly starting to import your files and database. First, you need to modify the datadirectory that is stored inside the database export:
1. At this point, you can finally install Nextcloud AIO on a new server/linux installation, enter your domain in the AIO interface (use the same domain that you used on your former installation) and wait until all containers are running. Then you should check the included Nextcloud version by running `sudo docker inspect nextcloud-aio-nextcloud | grep NEXTCLOUD_VERSION`. On the AIO interface, use the passphrase to connect to your newly created Nextcloud instance's admin account. There, install all the Nextcloud apps that were installed on the old Nextcloud installation. If you don't, the migration will show them as installed, but they won't work.
1. Next, take a backup using Nextcloud AIO's built-in backup solution (so that you can easily restore to this state again). Once finished, all containers are automatically stopped and is expected: **don't start the container again at this point!**
1. Now, with the containers still stopped, we are slowly starting to import your files and database. First, you need to modify the datadirectory that is stored inside the database export:
1. Find out what the directory of your old Nextcloud installation is by e.g. opening the config.php file and looking at the value `datadirectory`.
1. Now, create a copy of the database file so that you can simply restore it if you should make a mistake while editing: `cp database-dump.sql database-dump.sql.backup`
1. Next, open the database export with e.g. nano: `nano database-dump.sql`
@@ -81,7 +81,6 @@ The same applies for the second statement, check with `grep " OWNER TO nextcloud
1. Next, run `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chown -R 33:0 /mnt/ncdata/` and `sudo docker run --rm --volume nextcloud_aio_nextcloud_data:/mnt/ncdata:rw alpine chmod -R 750 /mnt/ncdata/` to apply the correct permissions on the datadirectory. (Or if `NEXTCLOUD_DATADIR` was provided, apply `chown -R 33:0` and `chmod -R 750` to the chosen path.)
1. Edit the Nextcloud AIO config.php file using `sudo docker run -it --rm --volume nextcloud_aio_nextcloud:/var/www/html:rw alpine sh -c "apk add --no-cache nano && nano /var/www/html/config/config.php"` and modify only `passwordsalt`, `secret`, `instanceid` and set it to the old values that you used on your old installation. If you are brave, feel free to modify further values e.g. add your old LDAP config or S3 storage config. (Some things like Mail server config can be added back using Nextcloud's webinterface later on).
1. When you are done and saved your changes to the file, finally start the containers again and wait until all containers are running.
1. As last step, install all apps again that were installed before on your old instance by using the webinterface.
Now the whole Nextcloud instance should work again.<br>
If not, feel free to restore the AIO instance from backup and start at step 8 again.

View File

@@ -1,6 +1,6 @@
name: nextcloud-aio-helm-chart
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
version: 10.14.0
version: 10.15.0
apiVersion: v2
keywords:
- latest

View File

@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-apache
spec:
@@ -61,7 +61,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: WHITEBOARD_HOST
value: nextcloud-aio-whiteboard
image: ghcr.io/nextcloud-releases/aio-apache:20250512_082954
image: ghcr.io/nextcloud-releases/aio-apache:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
@@ -18,7 +18,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-clamav
spec:
@@ -36,7 +36,7 @@ spec:
{{- end }}
initContainers:
- name: init-subpath
image: ghcr.io/nextcloud-releases/aio-alpine:20250512_082954
image: ghcr.io/nextcloud-releases/aio-alpine:20250526_095855
command:
- mkdir
- "-p"
@@ -59,7 +59,7 @@ spec:
value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-clamav:20250512_082954
image: ghcr.io/nextcloud-releases/aio-clamav:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-collabora
spec:
@@ -35,7 +35,7 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+
- name: server_name
value: "{{ .Values.NC_DOMAIN }}"
image: ghcr.io/nextcloud-releases/aio-collabora:20250512_082954
image: ghcr.io/nextcloud-releases/aio-collabora:20250526_095855
readinessProbe:
exec:
command:
@@ -61,4 +61,5 @@ spec:
add:
- MKNOD
- CAP_SYS_ADMIN
- CHOWN
{{- end }}

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora

View File

@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-database
spec:
@@ -35,7 +35,7 @@ spec:
{{- end }}
initContainers:
- name: init-subpath
image: ghcr.io/nextcloud-releases/aio-alpine:20250512_082954
image: ghcr.io/nextcloud-releases/aio-alpine:20250526_095855
command:
- mkdir
- "-p"
@@ -64,7 +64,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-postgresql:20250512_082954
image: ghcr.io/nextcloud-releases/aio-postgresql:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
@@ -18,13 +18,13 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
spec:
initContainers:
- name: init-volumes
image: ghcr.io/nextcloud-releases/aio-alpine:20250512_082954
image: ghcr.io/nextcloud-releases/aio-alpine:20250526_095855
command:
- chmod
- "777"
@@ -54,7 +54,7 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: ghcr.io/nextcloud-releases/aio-fulltextsearch:20250512_082954
image: ghcr.io/nextcloud-releases/aio-fulltextsearch:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-imaginary
spec:
@@ -38,7 +38,7 @@ spec:
value: "{{ .Values.IMAGINARY_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-imaginary:20250512_082954
image: ghcr.io/nextcloud-releases/aio-imaginary:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary

View File

@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-nextcloud
spec:
@@ -38,7 +38,7 @@ spec:
# AIO settings start # Do not remove or change this line!
initContainers:
- name: init-volumes
image: ghcr.io/nextcloud-releases/aio-alpine:20250512_082954
image: ghcr.io/nextcloud-releases/aio-alpine:20250526_095855
command:
- chmod
- "777"
@@ -182,7 +182,7 @@ spec:
value: "{{ .Values.WHITEBOARD_ENABLED }}"
- name: WHITEBOARD_SECRET
value: "{{ .Values.WHITEBOARD_SECRET }}"
image: ghcr.io/nextcloud-releases/aio-nextcloud:20250512_082954
image: ghcr.io/nextcloud-releases/aio-nextcloud:20250526_095855
{{- if eq (.Values.RPSS_ENABLED | default "no") "yes" }} # AIO-config - do not change this comment!
securityContext:
# The items below only work in container context

View File

@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud

View File

@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-notify-push
spec:
@@ -55,7 +55,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-notify-push:20250512_082954
image: ghcr.io/nextcloud-releases/aio-notify-push:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
@@ -18,13 +18,13 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
spec:
initContainers:
- name: init-volumes
image: ghcr.io/nextcloud-releases/aio-alpine:20250512_082954
image: ghcr.io/nextcloud-releases/aio-alpine:20250526_095855
command:
- chmod
- "777"
@@ -42,7 +42,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-onlyoffice:20250512_082954
image: ghcr.io/nextcloud-releases/aio-onlyoffice:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice

View File

@@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
@@ -17,7 +17,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-redis
spec:
@@ -39,7 +39,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-redis:20250512_082954
image: ghcr.io/nextcloud-releases/aio-redis:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk
spec:
@@ -52,7 +52,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-talk:20250512_082954
image: ghcr.io/nextcloud-releases/aio-talk:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk-recording
name: nextcloud-aio-talk-recording
@@ -18,7 +18,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk-recording
spec:
@@ -44,7 +44,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-talk-recording:20250512_082954
image: ghcr.io/nextcloud-releases/aio-talk-recording:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk-recording
name: nextcloud-aio-talk-recording

View File

@@ -4,7 +4,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk-public
@@ -28,7 +28,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk

View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-whiteboard
name: nextcloud-aio-whiteboard
@@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-whiteboard
spec:
@@ -48,7 +48,7 @@ spec:
value: redis
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: ghcr.io/nextcloud-releases/aio-whiteboard:20250512_082954
image: ghcr.io/nextcloud-releases/aio-whiteboard:20250526_095855
readinessProbe:
exec:
command:

View File

@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.version: 1.35.0 (9532ceef3)
kompose.version: 1.36.0 (ae2a39403)
labels:
io.kompose.service: nextcloud-aio-whiteboard
name: nextcloud-aio-whiteboard

View File

@@ -27,7 +27,7 @@ cp latest.yml latest.yml.backup
# Additional config
# shellcheck disable=SC1083
sed -i -E '/^( *- )(NET_RAW|SYS_NICE|MKNOD|SYS_ADMIN)$/!s/( *- )([A-Z_]+)$/\1\2=${\2}/' latest.yml
sed -i -E '/^( *- )(NET_RAW|SYS_NICE|MKNOD|SYS_ADMIN|CHOWN)$/!s/( *- )([A-Z_]+)$/\1\2=${\2}/' latest.yml
cp sample.conf /tmp/
sed -i 's|^|export |' /tmp/sample.conf
# shellcheck disable=SC1091

66
php/composer.lock generated
View File

@@ -1331,16 +1331,16 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.5.1",
"version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
"reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
"reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
"shasum": ""
},
"require": {
@@ -1353,7 +1353,7 @@
"name": "symfony/contracts"
},
"branch-alias": {
"dev-main": "3.5-dev"
"dev-main": "3.6-dev"
}
},
"autoload": {
@@ -1378,7 +1378,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
},
"funding": [
{
@@ -1394,7 +1394,7 @@
"type": "tidelift"
}
],
"time": "2024-09-25T14:20:29+00:00"
"time": "2024-09-25T14:21:43+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -3948,16 +3948,16 @@
},
{
"name": "symfony/console",
"version": "v6.4.21",
"version": "v6.4.22",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "a3011c7b7adb58d89f6c0d822abb641d7a5f9719"
"reference": "7d29659bc3c9d8e9a34e2c3414ef9e9e003e6cf3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/a3011c7b7adb58d89f6c0d822abb641d7a5f9719",
"reference": "a3011c7b7adb58d89f6c0d822abb641d7a5f9719",
"url": "https://api.github.com/repos/symfony/console/zipball/7d29659bc3c9d8e9a34e2c3414ef9e9e003e6cf3",
"reference": "7d29659bc3c9d8e9a34e2c3414ef9e9e003e6cf3",
"shasum": ""
},
"require": {
@@ -4022,7 +4022,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.4.21"
"source": "https://github.com/symfony/console/tree/v6.4.22"
},
"funding": [
{
@@ -4038,11 +4038,11 @@
"type": "tidelift"
}
],
"time": "2025-04-07T15:42:41+00:00"
"time": "2025-05-07T07:05:04+00:00"
},
{
"name": "symfony/filesystem",
"version": "v7.2.0",
"version": "v7.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -4088,7 +4088,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v7.2.0"
"source": "https://github.com/symfony/filesystem/tree/v7.3.0"
},
"funding": [
{
@@ -4407,16 +4407,16 @@
},
{
"name": "symfony/service-contracts",
"version": "v3.5.1",
"version": "v3.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
"reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
"reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
"reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
"shasum": ""
},
"require": {
@@ -4434,7 +4434,7 @@
"name": "symfony/contracts"
},
"branch-alias": {
"dev-main": "3.5-dev"
"dev-main": "3.6-dev"
}
},
"autoload": {
@@ -4470,7 +4470,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
"source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
},
"funding": [
{
@@ -4486,20 +4486,20 @@
"type": "tidelift"
}
],
"time": "2024-09-25T14:20:29+00:00"
"time": "2025-04-25T09:37:31+00:00"
},
{
"name": "symfony/string",
"version": "v7.2.6",
"version": "v7.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931"
"reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
"reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
"url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
"reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
"shasum": ""
},
"require": {
@@ -4557,7 +4557,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v7.2.6"
"source": "https://github.com/symfony/string/tree/v7.3.0"
},
"funding": [
{
@@ -4573,20 +4573,20 @@
"type": "tidelift"
}
],
"time": "2025-04-20T20:18:16+00:00"
"time": "2025-04-20T20:19:01+00:00"
},
{
"name": "vimeo/psalm",
"version": "6.10.3",
"version": "6.11.0",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
"reference": "90b5b9f5e7c8e441b191d3c82c58214753d7c7c1"
"reference": "4ed53b7ccebc09ef60ec4c9e464bf8a01bfd35b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vimeo/psalm/zipball/90b5b9f5e7c8e441b191d3c82c58214753d7c7c1",
"reference": "90b5b9f5e7c8e441b191d3c82c58214753d7c7c1",
"url": "https://api.github.com/repos/vimeo/psalm/zipball/4ed53b7ccebc09ef60ec4c9e464bf8a01bfd35b0",
"reference": "4ed53b7ccebc09ef60ec4c9e464bf8a01bfd35b0",
"shasum": ""
},
"require": {
@@ -4691,7 +4691,7 @@
"issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm"
},
"time": "2025-05-05T18:23:39+00:00"
"time": "2025-05-12T11:30:26+00:00"
},
{
"name": "wapmorgan/php-deprecation-detector",

View File

@@ -1,81 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="6.10.3@90b5b9f5e7c8e441b191d3c82c58214753d7c7c1">
<file src="src/Auth/AuthManager.php">
<ClassMustBeFinal>
<code><![CDATA[AuthManager]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Auth/PasswordGenerator.php">
<ClassMustBeFinal>
<code><![CDATA[PasswordGenerator]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/AioVariables.php">
<ClassMustBeFinal>
<code><![CDATA[AioVariables]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/Container.php">
<ClassMustBeFinal>
<code><![CDATA[Container]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerEnvironmentVariables.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerEnvironmentVariables]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerPort.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerPort]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerPorts.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerPorts]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerVolume.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerVolume]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Container/ContainerVolumes.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerVolumes]]></code>
</ClassMustBeFinal>
</file>
<files psalm-version="6.11.0@4ed53b7ccebc09ef60ec4c9e464bf8a01bfd35b0">
<file src="src/ContainerDefinitionFetcher.php">
<ClassMustBeFinal>
<code><![CDATA[ContainerDefinitionFetcher]]></code>
</ClassMustBeFinal>
<PossiblyFalseArgument>
<code><![CDATA[file_get_contents($path)]]></code>
<code><![CDATA[file_get_contents(__DIR__ . '/../containers.json')]]></code>
</PossiblyFalseArgument>
</file>
<file src="src/Controller/ConfigurationController.php">
<ClassMustBeFinal>
<code><![CDATA[ConfigurationController]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Controller/DockerController.php">
<ClassMustBeFinal>
<code><![CDATA[DockerController]]></code>
</ClassMustBeFinal>
<InvalidOperand>
<code><![CDATA[$port]]></code>
</InvalidOperand>
</file>
<file src="src/Controller/LoginController.php">
<ClassMustBeFinal>
<code><![CDATA[LoginController]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Data/ConfigurationManager.php">
<ClassMustBeFinal>
<code><![CDATA[ConfigurationManager]]></code>
</ClassMustBeFinal>
<FalsableReturnStatement>
<code><![CDATA[$additionalBackupDirectories]]></code>
</FalsableReturnStatement>
@@ -98,9 +34,6 @@
</PossiblyFalseArgument>
</file>
<file src="src/Data/DataConst.php">
<ClassMustBeFinal>
<code><![CDATA[DataConst]]></code>
</ClassMustBeFinal>
<FalsableReturnStatement>
<code><![CDATA[realpath(__DIR__ . '/../../../community-containers/')]]></code>
<code><![CDATA[realpath(__DIR__ . '/../../data/')]]></code>
@@ -112,57 +45,18 @@
<code><![CDATA[string]]></code>
</InvalidFalsableReturnType>
</file>
<file src="src/Data/InvalidSettingConfigurationException.php">
<ClassMustBeFinal>
<code><![CDATA[InvalidSettingConfigurationException]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Data/Setup.php">
<ClassMustBeFinal>
<code><![CDATA[Setup]]></code>
</ClassMustBeFinal>
</file>
<file src="src/DependencyInjection.php">
<ClassMustBeFinal>
<code><![CDATA[DependencyInjection]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Docker/DockerActionManager.php">
<ClassMustBeFinal>
<code><![CDATA[DockerActionManager]]></code>
</ClassMustBeFinal>
<PossiblyFalseArgument>
<code><![CDATA[$line]]></code>
<code><![CDATA[$line]]></code>
</PossiblyFalseArgument>
</file>
<file src="src/Docker/DockerHubManager.php">
<ClassMustBeFinal>
<code><![CDATA[DockerHubManager]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Docker/GitHubContainerRegistryManager.php">
<ClassMustBeFinal>
<code><![CDATA[GitHubContainerRegistryManager]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Middleware/AuthMiddleware.php">
<ClassMustBeFinal>
<code><![CDATA[AuthMiddleware]]></code>
</ClassMustBeFinal>
</file>
<file src="src/Twig/ClassExtension.php">
<ClassMustBeFinal>
<code><![CDATA[ClassExtension]]></code>
</ClassMustBeFinal>
<MissingOverrideAttribute>
<code><![CDATA[public function getFunctions() : array]]></code>
</MissingOverrideAttribute>
</file>
<file src="src/Twig/CsrfExtension.php">
<ClassMustBeFinal>
<code><![CDATA[CsrfExtension]]></code>
</ClassMustBeFinal>
<MissingOverrideAttribute>
<code><![CDATA[public function getGlobals() : array]]></code>
</MissingOverrideAttribute>

View File

@@ -19,5 +19,6 @@
<directory name="vendor" />
</extraFiles>
<issueHandlers>
<ClassMustBeFinal errorLevel="suppress" />
</issueHandlers>
</psalm>

View File

@@ -0,0 +1,88 @@
document.addEventListener("DOMContentLoaded", function () {
// Hide submit button initially
const optionsFormSubmit = document.getElementById("options-form-submit");
optionsFormSubmit.style.display = 'none';
const communityFormSubmit = document.getElementById("community-form-submit");
communityFormSubmit.style.display = 'none';
// Store initial states for all checkboxes
const initialStateOptionsContainers = {};
const initialStateCommunityContainers = {};
const optionsContainersCheckboxes = document.querySelectorAll("#options-form input[type='checkbox']");
const communityContainersCheckboxes = document.querySelectorAll("#community-form input[type='checkbox']");
optionsContainersCheckboxes.forEach(checkbox => {
initialStateOptionsContainers[checkbox.id] = checkbox.checked; // Use checked property to capture actual initial state
});
communityContainersCheckboxes.forEach(checkbox => {
initialStateCommunityContainers[checkbox.id] = checkbox.checked; // Use checked property to capture actual initial state
});
// Function to compare current states to initial states
function checkForOptionContainerChanges() {
let hasChanges = false;
optionsContainersCheckboxes.forEach(checkbox => {
if (checkbox.checked !== initialStateOptionsContainers[checkbox.id]) {
hasChanges = true;
}
});
// Show or hide submit button based on changes
optionsFormSubmit.style.display = hasChanges ? 'block' : 'none';
}
// Function to compare current states to initial states
function checkForCommunityContainerChanges() {
let hasChanges = false;
communityContainersCheckboxes.forEach(checkbox => {
if (checkbox.checked !== initialStateCommunityContainers[checkbox.id]) {
hasChanges = true;
}
});
// Show or hide submit button based on changes
communityFormSubmit.style.display = hasChanges ? 'block' : 'none';
}
// Event listener to trigger visibility check on each change
optionsContainersCheckboxes.forEach(checkbox => {
checkbox.addEventListener("change", checkForOptionContainerChanges);
});
communityContainersCheckboxes.forEach(checkbox => {
checkbox.addEventListener("change", checkForCommunityContainerChanges);
});
// Custom behaviors for specific options
function handleTalkVisibility() {
const talkRecording = document.getElementById("talk-recording");
if (document.getElementById("talk").checked) {
talkRecording.disabled = false;
} else {
talkRecording.checked = false;
talkRecording.disabled = true;
}
checkForOptionContainerChanges(); // Check changes after toggling Talk Recording
}
function handleDockerSocketProxyWarning() {
if (document.getElementById("docker-socket-proxy").checked) {
alert('⚠️ Warning! Enabling this container comes with possible Security problems since you are exposing the docker socket and all its privileges to the Nextcloud container. Enable this only if you are sure what you are doing!');
}
}
// Initialize event listeners for specific behaviors
document.getElementById("talk").addEventListener('change', handleTalkVisibility);
document.getElementById("docker-socket-proxy").addEventListener('change', handleDockerSocketProxyWarning);
// Initialize talk-recording visibility on page load
handleTalkVisibility(); // Ensure talk-recording is correctly initialized
// Initial call to check for changes
checkForOptionContainerChanges();
checkForCommunityContainerChanges();
});

View File

@@ -128,7 +128,9 @@ $app->get('/containers', function (Request $request, Response $response, array $
'is_nvidia_gpu_enabled' => $configurationManager->isNvidiaGpuEnabled(),
'is_talk_recording_enabled' => $configurationManager->isTalkRecordingEnabled(),
'is_docker_socket_proxy_enabled' => $configurationManager->isDockerSocketProxyEnabled(),
'is_whiteboard_enabled' => $configurationManager->isWhiteboardEnabled(),
'is_whiteboard_enabled' => $configurationManager->isWhiteboardEnabled(),
'community_containers' => $configurationManager->listAvailableCommunityContainers(),
'community_containers_enabled' => $configurationManager->GetEnabledCommunityContainers(),
]);
})->setName('profile');
$app->get('/login', function (Request $request, Response $response, array $args) use ($container) {

View File

@@ -1,60 +0,0 @@
document.addEventListener("DOMContentLoaded", function () {
// Hide submit button initially
const optionsFormSubmit = document.getElementById("options-form-submit");
optionsFormSubmit.style.display = 'none';
// Store initial states for all checkboxes
const initialState = {};
const checkboxes = document.querySelectorAll("#options-form input[type='checkbox']");
checkboxes.forEach(checkbox => {
initialState[checkbox.id] = checkbox.checked; // Use checked property to capture actual initial state
});
// Function to compare current states to initial states
function checkForChanges() {
let hasChanges = false;
checkboxes.forEach(checkbox => {
if (checkbox.checked !== initialState[checkbox.id]) {
hasChanges = true;
}
});
// Show or hide submit button based on changes
optionsFormSubmit.style.display = hasChanges ? 'block' : 'none';
}
// Event listener to trigger visibility check on each change
checkboxes.forEach(checkbox => {
checkbox.addEventListener("change", checkForChanges);
});
// Custom behaviors for specific options
function handleTalkVisibility() {
const talkRecording = document.getElementById("talk-recording");
if (document.getElementById("talk").checked) {
talkRecording.disabled = false;
} else {
talkRecording.checked = false;
talkRecording.disabled = true;
}
checkForChanges(); // Check changes after toggling Talk Recording
}
function handleDockerSocketProxyWarning() {
if (document.getElementById("docker-socket-proxy").checked) {
alert('⚠️ Warning! Enabling this container comes with possible Security problems since you are exposing the docker socket and all its privileges to the Nextcloud container. Enable this only if you are sure what you are doing!');
}
}
// Initialize event listeners for specific behaviors
document.getElementById("talk").addEventListener('change', handleTalkVisibility);
document.getElementById("docker-socket-proxy").addEventListener('change', handleDockerSocketProxyWarning);
// Initialize talk-recording visibility on page load
handleTalkVisibility(); // Ensure talk-recording is correctly initialized
// Initial call to check for changes
checkForChanges();
});

View File

@@ -15,7 +15,7 @@ readonly class ConfigurationController {
) {
}
public function SetConfig(Request $request, Response $response, array $args) : Response {
public function SetConfig(Request $request, Response $response, array $args): Response {
try {
if (isset($request->getParsedBody()['domain'])) {
$domain = $request->getParsedBody()['domain'] ?? '';
@@ -125,6 +125,20 @@ readonly class ConfigurationController {
}
}
if (isset($request->getParsedBody()['community-form'])) {
$cc = $this->configurationManager->listAvailableCommunityContainers();
$enabledCC = [];
/**
* @psalm-suppress PossiblyNullIterator
*/
foreach ($request->getParsedBody() as $item) {
if (array_key_exists($item , $cc)) {
$enabledCC[] = $item;
}
}
$this->configurationManager->SetEnabledCommunityContainers($enabledCC);
}
if (isset($request->getParsedBody()['delete_collabora_dictionaries'])) {
$this->configurationManager->DeleteCollaboraDictionaries();
}

View File

@@ -75,7 +75,7 @@ class ConfigurationManager
if (!file_exists(DataConst::GetBackupArchivesList())) {
return '';
}
$content = file_get_contents(DataConst::GetBackupArchivesList());
if ($content === '') {
return '';
@@ -95,7 +95,7 @@ class ConfigurationManager
if ($lastBackupTime === "") {
return '';
}
return $lastBackupTime;
}
@@ -103,7 +103,7 @@ class ConfigurationManager
if (!file_exists(DataConst::GetBackupArchivesList())) {
return [];
}
$content = file_get_contents(DataConst::GetBackupArchivesList());
if ($content === '') {
return [];
@@ -114,7 +114,7 @@ class ConfigurationManager
foreach($backupLines as $lines) {
if ($lines !== "") {
$backupTimesTemp = explode(',', $lines);
$backupTimes[] = $backupTimesTemp[1];
$backupTimes[] = $backupTimesTemp[1];
}
}
@@ -140,7 +140,7 @@ class ConfigurationManager
}
}
public function isClamavEnabled() : bool {
public function isClamavEnabled() : bool {
$config = $this->GetConfig();
if (isset($config['isClamavEnabled']) && $config['isClamavEnabled'] === 1) {
return true;
@@ -375,7 +375,7 @@ class ConfigurationManager
$testUrl = $protocol . $domain . ':443';
curl_setopt($ch, CURLOPT_URL, $testUrl);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
curl_setopt($ch, CURLOPT_TIMEOUT, 10);
$response = (string)curl_exec($ch);
# Get rid of trailing \n
@@ -474,7 +474,7 @@ class ConfigurationManager
} elseif ($location !== '' && $repo !== '') {
throw new InvalidSettingConfigurationException("Location and remote repo url are mutually exclusive!");
}
if ($location !== '') {
$isValidPath = false;
if (str_starts_with($location, '/') && !str_ends_with($location, '/')) {
@@ -629,7 +629,7 @@ class ConfigurationManager
if (!file_exists(DataConst::GetBackupPublicKey())) {
return "";
}
return trim(file_get_contents(DataConst::GetBackupPublicKey()));
}
@@ -771,7 +771,7 @@ class ConfigurationManager
if (!preg_match("#^[0-1][0-9]:[0-5][0-9]$#", $time) && !preg_match("#^2[0-3]:[0-5][0-9]$#", $time)) {
throw new InvalidSettingConfigurationException("You did not enter a correct time! One correct example is '04:00'!");
}
if ($enableAutomaticUpdates === false) {
$time .= PHP_EOL . 'automaticUpdatesAreNotEnabled';
} else {
@@ -1008,16 +1008,61 @@ class ConfigurationManager
}
private function GetCommunityContainers() : string {
$envVariableName = 'AIO_COMMUNITY_CONTAINERS';
$configName = 'aio_community_containers';
$defaultValue = '';
return $this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue);
$config = $this->GetConfig();
if(!isset($config['aio_community_containers'])) {
$config['aio_community_containers'] = '';
}
return $config['aio_community_containers'];
}
public function GetEnabledCommunityContainers() : array {
public function listAvailableCommunityContainers() : array {
$cc = [];
$dir = scandir(DataConst::GetCommunityContainersDirectory());
if ($dir === false) {
return $cc;
}
// Get rid of dots from the scandir command
$dir = array_diff($dir, array('..', '.', 'readme.md'));
foreach ($dir as $id) {
$filePath = DataConst::GetCommunityContainersDirectory() . '/' . $id . '/' . $id . '.json';
$fileContents = apcu_fetch($filePath);
if (!is_string($fileContents)) {
$fileContents = file_get_contents($filePath);
if (is_string($fileContents)) {
apcu_add($filePath, $fileContents);
}
}
$json = is_string($fileContents) ? json_decode($fileContents, true) : false;
if(is_array($json) && is_array($json['aio_services_v1'])) {
foreach ($json['aio_services_v1'] as $service) {
$documentation = is_string($service['documentation']) ? $service['documentation'] : '';
if (is_string($service['display_name'])) {
$cc[$id] = [
'id' => $id,
'name' => $service['display_name'],
'documentation' => $documentation
];
}
break;
}
}
}
return $cc;
}
/** @return list<string> */
public function GetEnabledCommunityContainers(): array {
return explode(' ', $this->GetCommunityContainers());
}
public function SetEnabledCommunityContainers(array $enabledCommunityContainers) : void {
$config = $this->GetConfig();
$config['aio_community_containers'] = implode(' ', $enabledCommunityContainers);
$this->WriteConfig($config);
}
private function GetEnabledDriDevice() : string {
$envVariableName = 'NEXTCLOUD_ENABLE_DRI_DEVICE';
$configName = 'nextcloud_enable_dri_device';

View File

@@ -17,7 +17,7 @@
<div class="container">
<main>
<h1>Nextcloud AIO v10.15.0</h1>
<h1>Nextcloud AIO v11.0.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -33,7 +33,7 @@
{% set isBackupOrRestoreRunning = 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 #}
{% set newMajorVersion = 31 %}
{% set newMajorVersion = '' %}
{% if is_backup_container_running == true %}
{% if borg_backup_mode == 'backup' or borg_backup_mode == 'restore' %}
@@ -602,10 +602,14 @@
</form>
{% endif %}
{% endif %}
{{ include('includes/community-containers.twig') }}
{% endif %}
{% endif %}
{% endif %}
<script type="text/javascript" src="containers-form-submit.js?v4"></script>
{% if isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true %}
<script type="text/javascript" src="automatic_reload.js"></script>
{% else %}

View File

@@ -0,0 +1,42 @@
<h2>Community Containers</h2>
<p>In this section you can enable or disable optional Community Containers that are not included by default in the main installation. These containers are provided by the community and can be useful for various purposes and are automatically integrated in AIOs backup solution and update mechanisms.</p>
<p><strong>⚠️ Caution: </strong>Community Containers are maintained by the community and not officially by Nextcloud. Some containers may not be compatible with your system, may not work as expected or may discontinue. Use them at your own risk. Please read the documentation for each container first before adding any as some are also incompatible between each other! Never add all of them at the same time!</p>
{% if isAnyRunning == true %}
<p><strong>Please note:</strong> You can enable or disable the options below only when your containers are stopped.</p>
{% else %}
<p><strong>Please note:</strong> Make sure to save your changes by clicking <strong>Save changes</strong> below the list of Community Containers. The changes will not be auto-saved.</p>
{% endif %}
<details>
<summary>Show/Hide available Community Containers</summary>
<form id="community-form" method="POST" action="/api/configuration" class="xhr">
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="hidden" name="community-form" value="community-form">
{% for cc in community_containers %}
<p>
<input
type="checkbox"
id="{{ cc.id }}"
value="{{ cc.id }}"
name="{{ cc.id }}"
{% if cc.id in community_containers_enabled %}
checked="checked"
data-initial-state="true"
{% else %}
data-initial-state="false"
{% endif %}
{% if isAnyRunning == true %}
disabled="disabled"
{% endif %}
>
<label for="{{ cc.id }}">{{ cc.name }}
{% if cc.documentation != '' %}
<a href="{{ cc.documentation }}" target="_blank">(Documentation)</a>
{% endif %}
</label>
</p>
{% endfor %}
<input id="community-form-submit" type="submit" value="Save changes" onclick="return confirm('Are you sure that you read the documentation of all community containers that you enabled? If no, please do not continue as this might break your instance!')" />
</form>
</details>

View File

@@ -1,5 +1,5 @@
<h2>Optional containers</h2>
<p>In this section you can enable or disable optional containers. There are further community containers available that are not listed below. See <strong><a target="_blank" href="https://github.com/nextcloud/all-in-one/tree/main/community-containers#community-containers">this documentation</a></strong> how to add them.</p>
<p>In this section you can enable or disable optional containers.</p>
{% if isAnyRunning == true %}
<p><strong>Please note:</strong> You can enable or disable the options below only when your containers are stopped.</p>
{% else %}
@@ -143,7 +143,6 @@
<label for="whiteboard">Whiteboard</label>
</p>
<input id="options-form-submit" type="submit" value="Save changes" />
<script type="text/javascript" src="options-form-submit.js?v3"></script>
</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>
{% if isAnyRunning == true %}

View File

@@ -736,7 +736,7 @@ Afterwards apply the correct permissions with `sudo chown root:root /root/automa
1. save and close the crontab (when using nano the shortcuts for this are `Ctrl + o` then `Enter` to save, and close the editor with `Ctrl + x`).
### Securing the AIO interface from unauthorized ACME challenges
[By design](https://github.com/nextcloud/all-in-one/discussions/4882#discussioncomment-9858384), Caddy that runs inside the mastercontainer, which handles automatic TLS certificate generation for the AIO interface, is vulnerable to receiving DNS challenges for arbitrary hostnames from anyone on the internet. While this does not compromise your server's security, it can result in cluttered logs and rejected certificate renewal attempts due to rate limit abuse. To mitigate this issue, it is recommended to place the AIO interface behind a VPN and/or limit its public exposure.
[By design](https://github.com/nextcloud/all-in-one/discussions/4882#discussioncomment-9858384), Caddy that runs inside the mastercontainer, which handles automatic TLS certificate generation for the AIO interface on port 8443, is configured to accept traffic on any valid domain in order to make the AIO interface as convenient to use as possible. However due to this, it is vulnerable to receiving DNS challenges for arbitrary hostnames from anyone on the internet. While this does not compromise your server's security, it can result in cluttered logs and rejected certificate renewal attempts due to rate limit abuse. To mitigate this issue, it is recommended to place the AIO interface behind a VPN and/or limit its public exposure.
### How to migrate from an already existing Nextcloud installation to Nextcloud AIO?
Please see the following documentation on this: [migration.md](https://github.com/nextcloud/all-in-one/blob/main/migration.md)
@@ -820,7 +820,7 @@ Backing up directly to a remote borg repository is supported. This avoids having
Some alternatives, which do not have all the above benefits:
- Mount a network FS like SSHFS, SMB or NFS in the directory that you enter in AIO as backup directory
- Use rsync or rclone for syncing the borg backup archive that AIO creates locally to a remote target (make sure to lock the backup archive correctly before starting the sync; search for "aio-lockfile"; you can find a local example script here: https://github.com/nextcloud/all-in-one#sync-the-backup-regularly-to-another-drive)
- Use rsync or rclone for syncing the borg backup archive that AIO creates locally to a remote target (make sure to lock the backup archive correctly before starting the sync; search for "aio-lockfile"; you can find a local example script here: https://github.com/nextcloud/all-in-one#sync-local-backups-regularly-to-another-drive)
- You can find a well written guide that uses rclone and e.g. BorgBase for remote backups here: https://github.com/nextcloud/all-in-one/discussions/2247
- Here is another one that utilizes borgmatic and BorgBase for remote backups: https://github.com/nextcloud/all-in-one/discussions/4391
- create your own backup solution using a script and borg, borgmatic or any other to backup tool for backing up to a remote target (make sure to stop and start the AIO containers correctly following https://github.com/nextcloud/all-in-one#how-to-enable-automatic-updates-without-creating-a-backup-beforehand)

View File

@@ -24,6 +24,5 @@ See https://github.com/nextcloud/all-in-one#how-to-trust-user-defined-certificat
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_ENABLE_DRI_DEVICE=true`, the resulting Nextcloud container should have the /dev/dri device mounted into the container. (Only works if a `/dev/dri` device is present on the host)
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_ENABLE_NVIDIA_GPU=true`, the resulting Nextcloud container should have the nvidia gpu device mounted into the container. (Only works if a Nvidia GPU and runtime is installed on the host)
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_KEEP_DISABLED_APPS=true` it should keep apps in Nextcloud that are disabled in the AIO interface. For example if Collabora is disabled in the AIO interface and you install the richdocuments app in Nextcloud, a restart should not uninstall the richdocuments app in Nextcloud anymore.
- [ ] When starting the mastercontainer with `--env AIO_COMMUNITY_CONTAINERS="fail2ban"`, it should add the fail2ban container to the container stack and show it in the AIO interface as well as start it, etc.
You can now continue with [070-timezone-change.md](./070-timezone-change.md)