Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Nextcloud #17053

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Update Nextcloud #17053

merged 1 commit into from
Jun 26, 2024

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Jun 25, 2024

No description provided.

@J0WI J0WI requested a review from a team as a code owner June 25, 2024 23:15
@github-actions GitHub Actions
Copy link

Diff for 5d45a2b: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e59a14a..bffef48 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Nextcloud <[email protected]> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 27.1.10-apache, 27.1-apache, 27-apache, 27.1.10, 27.1, 27
+Tags: 27.1.11-apache, 27.1-apache, 27-apache, 27.1.11, 27.1, 27
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 27/apache
 
-Tags: 27.1.10-fpm, 27.1-fpm, 27-fpm
+Tags: 27.1.11-fpm, 27.1-fpm, 27-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 27/fpm
 
-Tags: 27.1.10-fpm-alpine, 27.1-fpm-alpine, 27-fpm-alpine
+Tags: 27.1.11-fpm-alpine, 27.1-fpm-alpine, 27-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 27/fpm-alpine
 
-Tags: 28.0.6-apache, 28.0-apache, 28-apache, stable-apache, production-apache, 28.0.6, 28.0, 28, stable, production
+Tags: 28.0.7-apache, 28.0-apache, 28-apache, 28.0.7, 28.0, 28
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 28/apache
 
-Tags: 28.0.6-fpm, 28.0-fpm, 28-fpm, stable-fpm, production-fpm
+Tags: 28.0.7-fpm, 28.0-fpm, 28-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 28/fpm
 
-Tags: 28.0.6-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 28.0.7-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 28/fpm-alpine
 
-Tags: 29.0.2-apache, 29.0-apache, 29-apache, apache, 29.0.2, 29.0, 29, latest
+Tags: 29.0.3-apache, 29.0-apache, 29-apache, apache, 29.0.3, 29.0, 29, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 29/apache
 
-Tags: 29.0.2-fpm, 29.0-fpm, 29-fpm, fpm
+Tags: 29.0.3-fpm, 29.0-fpm, 29-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 29/fpm
 
-Tags: 29.0.2-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, fpm-alpine
+Tags: 29.0.3-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bf8136a83843f27513a3fe4e2d1e0a20d90b6572
+GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 29/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index aebd16a..9b730f6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:27.1
 nextcloud:27.1-apache
 nextcloud:27.1-fpm
 nextcloud:27.1-fpm-alpine
-nextcloud:27.1.10
-nextcloud:27.1.10-apache
-nextcloud:27.1.10-fpm
-nextcloud:27.1.10-fpm-alpine
+nextcloud:27.1.11
+nextcloud:27.1.11-apache
+nextcloud:27.1.11-fpm
+nextcloud:27.1.11-fpm-alpine
 nextcloud:28
 nextcloud:28-apache
 nextcloud:28-fpm
@@ -18,10 +18,10 @@ nextcloud:28.0
 nextcloud:28.0-apache
 nextcloud:28.0-fpm
 nextcloud:28.0-fpm-alpine
-nextcloud:28.0.6
-nextcloud:28.0.6-apache
-nextcloud:28.0.6-fpm
-nextcloud:28.0.6-fpm-alpine
+nextcloud:28.0.7
+nextcloud:28.0.7-apache
+nextcloud:28.0.7-fpm
+nextcloud:28.0.7-fpm-alpine
 nextcloud:29
 nextcloud:29-apache
 nextcloud:29-fpm
@@ -30,19 +30,11 @@ nextcloud:29.0
 nextcloud:29.0-apache
 nextcloud:29.0-fpm
 nextcloud:29.0-fpm-alpine
-nextcloud:29.0.2
-nextcloud:29.0.2-apache
-nextcloud:29.0.2-fpm
-nextcloud:29.0.2-fpm-alpine
+nextcloud:29.0.3
+nextcloud:29.0.3-apache
+nextcloud:29.0.3-fpm
+nextcloud:29.0.3-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
 nextcloud:latest
-nextcloud:production
-nextcloud:production-apache
-nextcloud:production-fpm
-nextcloud:production-fpm-alpine
-nextcloud:stable
-nextcloud:stable-apache
-nextcloud:stable-fpm
-nextcloud:stable-fpm-alpine
diff --git a/nextcloud_27-fpm-alpine/Dockerfile b/nextcloud_27-fpm-alpine/Dockerfile
index c3a9fcb..9ed2936 100644
--- a/nextcloud_27-fpm-alpine/Dockerfile
+++ b/nextcloud_27-fpm-alpine/Dockerfile
@@ -113,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 27.1.10
+ENV NEXTCLOUD_VERSION 27.1.11
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -121,8 +121,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_27-fpm-alpine/entrypoint.sh b/nextcloud_27-fpm-alpine/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_27-fpm-alpine/entrypoint.sh
+++ b/nextcloud_27-fpm-alpine/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_27-fpm/Dockerfile b/nextcloud_27-fpm/Dockerfile
index cfbbf9e..8602fcc 100644
--- a/nextcloud_27-fpm/Dockerfile
+++ b/nextcloud_27-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 27.1.10
+ENV NEXTCLOUD_VERSION 27.1.11
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_27-fpm/entrypoint.sh b/nextcloud_27-fpm/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_27-fpm/entrypoint.sh
+++ b/nextcloud_27-fpm/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_27/Dockerfile b/nextcloud_27/Dockerfile
index 4163819..10b2e00 100644
--- a/nextcloud_27/Dockerfile
+++ b/nextcloud_27/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 27.1.10
+ENV NEXTCLOUD_VERSION 27.1.11
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_27/entrypoint.sh b/nextcloud_27/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_27/entrypoint.sh
+++ b/nextcloud_27/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_28-fpm-alpine/Dockerfile
similarity index 97%
rename from nextcloud_production-fpm-alpine/Dockerfile
rename to nextcloud_28-fpm-alpine/Dockerfile
index 018256a..63090ee 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_28-fpm-alpine/Dockerfile
@@ -113,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.6
+ENV NEXTCLOUD_VERSION 28.0.7
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -121,8 +121,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_production-fpm-alpine/config/apcu.config.php b/nextcloud_28-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apcu.config.php
rename to nextcloud_28-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_production-fpm-alpine/config/apps.config.php b/nextcloud_28-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apps.config.php
rename to nextcloud_28-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_production-fpm-alpine/config/autoconfig.php b/nextcloud_28-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/autoconfig.php
rename to nextcloud_28-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_production-fpm-alpine/config/redis.config.php b/nextcloud_28-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/redis.config.php
rename to nextcloud_28-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm-alpine/config/s3.config.php b/nextcloud_28-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/s3.config.php
rename to nextcloud_28-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_production-fpm-alpine/config/smtp.config.php b/nextcloud_28-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/smtp.config.php
rename to nextcloud_28-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_production-fpm-alpine/config/swift.config.php b/nextcloud_28-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/swift.config.php
rename to nextcloud_28-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php
rename to nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production-fpm-alpine/cron.sh b/nextcloud_28-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/cron.sh
rename to nextcloud_28-fpm-alpine/cron.sh
diff --git a/nextcloud_fpm-alpine/entrypoint.sh b/nextcloud_28-fpm-alpine/entrypoint.sh
similarity index 95%
copy from nextcloud_fpm-alpine/entrypoint.sh
copy to nextcloud_28-fpm-alpine/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_28-fpm-alpine/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_production-fpm-alpine/upgrade.exclude b/nextcloud_28-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm-alpine/upgrade.exclude
rename to nextcloud_28-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_28-fpm/Dockerfile
similarity index 97%
rename from nextcloud_production-fpm/Dockerfile
rename to nextcloud_28-fpm/Dockerfile
index 62015da..83c009f 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_28-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.6
+ENV NEXTCLOUD_VERSION 28.0.7
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_production-fpm/config/apcu.config.php b/nextcloud_28-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apcu.config.php
rename to nextcloud_28-fpm/config/apcu.config.php
diff --git a/nextcloud_production-fpm/config/apps.config.php b/nextcloud_28-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apps.config.php
rename to nextcloud_28-fpm/config/apps.config.php
diff --git a/nextcloud_production-fpm/config/autoconfig.php b/nextcloud_28-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm/config/autoconfig.php
rename to nextcloud_28-fpm/config/autoconfig.php
diff --git a/nextcloud_production-fpm/config/redis.config.php b/nextcloud_28-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/redis.config.php
rename to nextcloud_28-fpm/config/redis.config.php
diff --git a/nextcloud_production-fpm/config/reverse-proxy.config.php b/nextcloud_28-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/reverse-proxy.config.php
rename to nextcloud_28-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm/config/s3.config.php b/nextcloud_28-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/s3.config.php
rename to nextcloud_28-fpm/config/s3.config.php
diff --git a/nextcloud_production-fpm/config/smtp.config.php b/nextcloud_28-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/smtp.config.php
rename to nextcloud_28-fpm/config/smtp.config.php
diff --git a/nextcloud_production-fpm/config/swift.config.php b/nextcloud_28-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/swift.config.php
rename to nextcloud_28-fpm/config/swift.config.php
diff --git a/nextcloud_production-fpm/config/upgrade-disable-web.config.php b/nextcloud_28-fpm/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/upgrade-disable-web.config.php
rename to nextcloud_28-fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production-fpm/cron.sh b/nextcloud_28-fpm/cron.sh
similarity index 100%
rename from nextcloud_production-fpm/cron.sh
rename to nextcloud_28-fpm/cron.sh
diff --git a/nextcloud_fpm-alpine/entrypoint.sh b/nextcloud_28-fpm/entrypoint.sh
similarity index 95%
copy from nextcloud_fpm-alpine/entrypoint.sh
copy to nextcloud_28-fpm/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_28-fpm/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_production-fpm/upgrade.exclude b/nextcloud_28-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm/upgrade.exclude
rename to nextcloud_28-fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_28/Dockerfile
similarity index 97%
rename from nextcloud_production/Dockerfile
rename to nextcloud_28/Dockerfile
index e317d1d..2ea543a 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_28/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 28.0.6
+ENV NEXTCLOUD_VERSION 28.0.7
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_production/config/apache-pretty-urls.config.php b/nextcloud_28/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_production/config/apache-pretty-urls.config.php
rename to nextcloud_28/config/apache-pretty-urls.config.php
diff --git a/nextcloud_production/config/apcu.config.php b/nextcloud_28/config/apcu.config.php
similarity index 100%
rename from nextcloud_production/config/apcu.config.php
rename to nextcloud_28/config/apcu.config.php
diff --git a/nextcloud_production/config/apps.config.php b/nextcloud_28/config/apps.config.php
similarity index 100%
rename from nextcloud_production/config/apps.config.php
rename to nextcloud_28/config/apps.config.php
diff --git a/nextcloud_production/config/autoconfig.php b/nextcloud_28/config/autoconfig.php
similarity index 100%
rename from nextcloud_production/config/autoconfig.php
rename to nextcloud_28/config/autoconfig.php
diff --git a/nextcloud_production/config/redis.config.php b/nextcloud_28/config/redis.config.php
similarity index 100%
rename from nextcloud_production/config/redis.config.php
rename to nextcloud_28/config/redis.config.php
diff --git a/nextcloud_production/config/reverse-proxy.config.php b/nextcloud_28/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production/config/reverse-proxy.config.php
rename to nextcloud_28/config/reverse-proxy.config.php
diff --git a/nextcloud_production/config/s3.config.php b/nextcloud_28/config/s3.config.php
similarity index 100%
rename from nextcloud_production/config/s3.config.php
rename to nextcloud_28/config/s3.config.php
diff --git a/nextcloud_production/config/smtp.config.php b/nextcloud_28/config/smtp.config.php
similarity index 100%
rename from nextcloud_production/config/smtp.config.php
rename to nextcloud_28/config/smtp.config.php
diff --git a/nextcloud_production/config/swift.config.php b/nextcloud_28/config/swift.config.php
similarity index 100%
rename from nextcloud_production/config/swift.config.php
rename to nextcloud_28/config/swift.config.php
diff --git a/nextcloud_production/config/upgrade-disable-web.config.php b/nextcloud_28/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_production/config/upgrade-disable-web.config.php
rename to nextcloud_28/config/upgrade-disable-web.config.php
diff --git a/nextcloud_production/cron.sh b/nextcloud_28/cron.sh
similarity index 100%
rename from nextcloud_production/cron.sh
rename to nextcloud_28/cron.sh
diff --git a/nextcloud_fpm-alpine/entrypoint.sh b/nextcloud_28/entrypoint.sh
similarity index 95%
copy from nextcloud_fpm-alpine/entrypoint.sh
copy to nextcloud_28/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_28/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_production/upgrade.exclude b/nextcloud_28/upgrade.exclude
similarity index 100%
rename from nextcloud_production/upgrade.exclude
rename to nextcloud_28/upgrade.exclude
diff --git a/nextcloud_fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
index 17cfbaa..48aa3db 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -113,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.2
+ENV NEXTCLOUD_VERSION 29.0.3
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -121,8 +121,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_fpm-alpine/entrypoint.sh b/nextcloud_fpm-alpine/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_fpm-alpine/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_fpm/Dockerfile
index a6c640b..5bba909 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.2
+ENV NEXTCLOUD_VERSION 29.0.3
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_fpm/entrypoint.sh b/nextcloud_fpm/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_fpm/entrypoint.sh
+++ b/nextcloud_fpm/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_latest/Dockerfile
index c0aaaad..40b7c93 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 29.0.2
+ENV NEXTCLOUD_VERSION 29.0.3
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/nextcloud_latest/entrypoint.sh b/nextcloud_latest/entrypoint.sh
index 541971c..1c60984 100755
--- a/nextcloud_latest/entrypoint.sh
+++ b/nextcloud_latest/entrypoint.sh
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
     ) 9> /var/www/html/nextcloud-init-sync.lock
 
+    # warn if config files on persistent storage differ from the latest version of this image
+    for cfgPath in /usr/src/nextcloud/config/*.php; do
+        cfgFile=$(basename "$cfgPath")
+
+        if [ "$cfgFile" != "config.sample.php" ]; then
+            if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
+                echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
+            fi
+        fi
+    done
+
     run_path before-starting
 fi
 
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_production-fpm-alpine/entrypoint.sh
deleted file mode 100755
index 541971c..0000000
diff --git a/nextcloud_production-fpm/entrypoint.sh b/nextcloud_production-fpm/entrypoint.sh
deleted file mode 100755
index 541971c..0000000
diff --git a/nextcloud_production/entrypoint.sh b/nextcloud_production/entrypoint.sh
deleted file mode 100755
index 541971c..0000000

Relevant Maintainers:

@yosifkit yosifkit merged commit de5d8b9 into docker-library:master Jun 26, 2024
14 checks passed
@J0WI J0WI deleted the nextcloud-29.0.3 branch July 3, 2024 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/nextcloud
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@J0WI @yosifkit