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.

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

Update Nextcloud #17583

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Update Nextcloud #17583

merged 1 commit into from
Sep 18, 2024

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Sep 18, 2024

No description provided.

@J0WI J0WI requested a review from a team as a code owner September 18, 2024 20:52
Copy link

Diff for ab05b8d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6f60557..13ebbff 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,32 +1,47 @@
 Maintainers: Nextcloud <[email protected]> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 28.0.9-apache, 28.0-apache, 28-apache, 28.0.9, 28.0, 28
+Tags: 28.0.10-apache, 28.0-apache, 28-apache, 28.0.10, 28.0, 28
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3677cdf9ad7b77bd2d490901a300a924b6461f4f
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
 Directory: 28/apache
 
-Tags: 28.0.9-fpm, 28.0-fpm, 28-fpm
+Tags: 28.0.10-fpm, 28.0-fpm, 28-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 3677cdf9ad7b77bd2d490901a300a924b6461f4f
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
 Directory: 28/fpm
 
-Tags: 28.0.9-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
+Tags: 28.0.10-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 3677cdf9ad7b77bd2d490901a300a924b6461f4f
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
 Directory: 28/fpm-alpine
 
-Tags: 29.0.6-apache, 29.0-apache, 29-apache, apache, stable-apache, production-apache, 29.0.6, 29.0, 29, latest, stable, production
+Tags: 29.0.7-apache, 29.0-apache, 29-apache, stable-apache, production-apache, 29.0.7, 29.0, 29, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 53653c264827342eb7145115bee5138e2cb84443
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
 Directory: 29/apache
 
-Tags: 29.0.6-fpm, 29.0-fpm, 29-fpm, fpm, stable-fpm, production-fpm
+Tags: 29.0.7-fpm, 29.0-fpm, 29-fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 53653c264827342eb7145115bee5138e2cb84443
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
 Directory: 29/fpm
 
-Tags: 29.0.6-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 29.0.7-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 53653c264827342eb7145115bee5138e2cb84443
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
 Directory: 29/fpm-alpine
+
+Tags: 30.0.0-apache, 30.0-apache, 30-apache, apache, 30.0.0, 30.0, 30, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+Directory: 30/apache
+
+Tags: 30.0.0-fpm, 30.0-fpm, 30-fpm, fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+Directory: 30/fpm
+
+Tags: 30.0.0-fpm-alpine, 30.0-fpm-alpine, 30-fpm-alpine, fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 30b570f0b553736d63dc63cf487ff1e5e5331474
+Directory: 30/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 819eab0..ea78f69 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:28.0
 nextcloud:28.0-apache
 nextcloud:28.0-fpm
 nextcloud:28.0-fpm-alpine
-nextcloud:28.0.9
-nextcloud:28.0.9-apache
-nextcloud:28.0.9-fpm
-nextcloud:28.0.9-fpm-alpine
+nextcloud:28.0.10
+nextcloud:28.0.10-apache
+nextcloud:28.0.10-fpm
+nextcloud:28.0.10-fpm-alpine
 nextcloud:29
 nextcloud:29-apache
 nextcloud:29-fpm
@@ -18,10 +18,22 @@ nextcloud:29.0
 nextcloud:29.0-apache
 nextcloud:29.0-fpm
 nextcloud:29.0-fpm-alpine
-nextcloud:29.0.6
-nextcloud:29.0.6-apache
-nextcloud:29.0.6-fpm
-nextcloud:29.0.6-fpm-alpine
+nextcloud:29.0.7
+nextcloud:29.0.7-apache
+nextcloud:29.0.7-fpm
+nextcloud:29.0.7-fpm-alpine
+nextcloud:30
+nextcloud:30-apache
+nextcloud:30-fpm
+nextcloud:30-fpm-alpine
+nextcloud:30.0
+nextcloud:30.0-apache
+nextcloud:30.0-fpm
+nextcloud:30.0-fpm-alpine
+nextcloud:30.0.0
+nextcloud:30.0.0-apache
+nextcloud:30.0.0-fpm
+nextcloud:30.0.0-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index b87590c..d702661 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,9 @@
 nextcloud:28
 nextcloud:28-fpm
 nextcloud:28-fpm-alpine
+nextcloud:fpm
+nextcloud:fpm-alpine
+nextcloud:latest
 nextcloud:production
 nextcloud:production-fpm
 nextcloud:production-fpm-alpine
diff --git a/nextcloud_28-fpm-alpine/Dockerfile b/nextcloud_28-fpm-alpine/Dockerfile
index c0f2ad2..02ab245 100644
--- a/nextcloud_28-fpm-alpine/Dockerfile
+++ b/nextcloud_28-fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 28.0.10
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.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_28-fpm-alpine/entrypoint.sh b/nextcloud_28-fpm-alpine/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_28-fpm-alpine/entrypoint.sh
+++ b/nextcloud_28-fpm-alpine/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_28-fpm/Dockerfile b/nextcloud_28-fpm/Dockerfile
index ec28043..17432c8 100644
--- a/nextcloud_28-fpm/Dockerfile
+++ b/nextcloud_28-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 28.0.10
 
 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.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.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_28-fpm/entrypoint.sh b/nextcloud_28-fpm/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_28-fpm/entrypoint.sh
+++ b/nextcloud_28-fpm/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_28/Dockerfile b/nextcloud_28/Dockerfile
index a5f9087..9ac2e52 100644
--- a/nextcloud_28/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.9
+ENV NEXTCLOUD_VERSION 28.0.10
 
 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.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.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_28/entrypoint.sh b/nextcloud_28/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_28/entrypoint.sh
+++ b/nextcloud_28/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_28-fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
similarity index 97%
copy from nextcloud_28-fpm-alpine/Dockerfile
copy to nextcloud_fpm-alpine/Dockerfile
index c0f2ad2..11c6e1b 100644
--- a/nextcloud_28-fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 30.0.0
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.0.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.0.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_28-fpm-alpine/config/apcu.config.php b/nextcloud_fpm-alpine/config/apcu.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/apcu.config.php
copy to nextcloud_fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_28-fpm-alpine/config/apps.config.php b/nextcloud_fpm-alpine/config/apps.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/apps.config.php
copy to nextcloud_fpm-alpine/config/apps.config.php
diff --git a/nextcloud_28-fpm-alpine/config/autoconfig.php b/nextcloud_fpm-alpine/config/autoconfig.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/autoconfig.php
copy to nextcloud_fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_28-fpm-alpine/config/redis.config.php b/nextcloud_fpm-alpine/config/redis.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/redis.config.php
copy to nextcloud_fpm-alpine/config/redis.config.php
diff --git a/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_28-fpm-alpine/config/s3.config.php b/nextcloud_fpm-alpine/config/s3.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/s3.config.php
copy to nextcloud_fpm-alpine/config/s3.config.php
diff --git a/nextcloud_28-fpm-alpine/config/smtp.config.php b/nextcloud_fpm-alpine/config/smtp.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/smtp.config.php
copy to nextcloud_fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_28-fpm-alpine/config/swift.config.php b/nextcloud_fpm-alpine/config/swift.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/swift.config.php
copy to nextcloud_fpm-alpine/config/swift.config.php
diff --git a/nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_fpm-alpine/config/upgrade-disable-web.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
copy to nextcloud_fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_28-fpm-alpine/cron.sh b/nextcloud_fpm-alpine/cron.sh
similarity index 100%
copy from nextcloud_28-fpm-alpine/cron.sh
copy to nextcloud_fpm-alpine/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_fpm-alpine/entrypoint.sh
similarity index 99%
copy from nextcloud_production-fpm-alpine/entrypoint.sh
copy to nextcloud_fpm-alpine/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_production-fpm-alpine/entrypoint.sh
+++ b/nextcloud_fpm-alpine/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_28-fpm-alpine/upgrade.exclude b/nextcloud_fpm-alpine/upgrade.exclude
similarity index 100%
copy from nextcloud_28-fpm-alpine/upgrade.exclude
copy to nextcloud_fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_fpm/Dockerfile
similarity index 97%
copy from nextcloud_production-fpm/Dockerfile
copy to nextcloud_fpm/Dockerfile
index 8d8b8bb..e9a09f6 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 30.0.0
 
 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.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.0.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.0.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_28-fpm-alpine/config/apcu.config.php b/nextcloud_fpm/config/apcu.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/apcu.config.php
copy to nextcloud_fpm/config/apcu.config.php
diff --git a/nextcloud_28-fpm-alpine/config/apps.config.php b/nextcloud_fpm/config/apps.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/apps.config.php
copy to nextcloud_fpm/config/apps.config.php
diff --git a/nextcloud_28-fpm-alpine/config/autoconfig.php b/nextcloud_fpm/config/autoconfig.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/autoconfig.php
copy to nextcloud_fpm/config/autoconfig.php
diff --git a/nextcloud_28-fpm-alpine/config/redis.config.php b/nextcloud_fpm/config/redis.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/redis.config.php
copy to nextcloud_fpm/config/redis.config.php
diff --git a/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_28-fpm-alpine/config/s3.config.php b/nextcloud_fpm/config/s3.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/s3.config.php
copy to nextcloud_fpm/config/s3.config.php
diff --git a/nextcloud_28-fpm-alpine/config/smtp.config.php b/nextcloud_fpm/config/smtp.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/smtp.config.php
copy to nextcloud_fpm/config/smtp.config.php
diff --git a/nextcloud_28-fpm-alpine/config/swift.config.php b/nextcloud_fpm/config/swift.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/swift.config.php
copy to nextcloud_fpm/config/swift.config.php
diff --git a/nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_fpm/config/upgrade-disable-web.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
copy to nextcloud_fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_28-fpm-alpine/cron.sh b/nextcloud_fpm/cron.sh
similarity index 100%
copy from nextcloud_28-fpm-alpine/cron.sh
copy to nextcloud_fpm/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_fpm/entrypoint.sh
similarity index 99%
copy from nextcloud_production-fpm-alpine/entrypoint.sh
copy to nextcloud_fpm/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_production-fpm-alpine/entrypoint.sh
+++ b/nextcloud_fpm/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_28-fpm-alpine/upgrade.exclude b/nextcloud_fpm/upgrade.exclude
similarity index 100%
copy from nextcloud_28-fpm-alpine/upgrade.exclude
copy to nextcloud_fpm/upgrade.exclude
diff --git a/nextcloud_28/Dockerfile b/nextcloud_latest/Dockerfile
similarity index 97%
copy from nextcloud_28/Dockerfile
copy to nextcloud_latest/Dockerfile
index a5f9087..93642f7 100644
--- a/nextcloud_28/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 30.0.0
 
 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.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.0.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.0.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_28/config/apache-pretty-urls.config.php b/nextcloud_latest/config/apache-pretty-urls.config.php
similarity index 100%
copy from nextcloud_28/config/apache-pretty-urls.config.php
copy to nextcloud_latest/config/apache-pretty-urls.config.php
diff --git a/nextcloud_28-fpm-alpine/config/apcu.config.php b/nextcloud_latest/config/apcu.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/apcu.config.php
copy to nextcloud_latest/config/apcu.config.php
diff --git a/nextcloud_28-fpm-alpine/config/apps.config.php b/nextcloud_latest/config/apps.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/apps.config.php
copy to nextcloud_latest/config/apps.config.php
diff --git a/nextcloud_28-fpm-alpine/config/autoconfig.php b/nextcloud_latest/config/autoconfig.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/autoconfig.php
copy to nextcloud_latest/config/autoconfig.php
diff --git a/nextcloud_28-fpm-alpine/config/redis.config.php b/nextcloud_latest/config/redis.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/redis.config.php
copy to nextcloud_latest/config/redis.config.php
diff --git a/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_latest/config/reverse-proxy.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
copy to nextcloud_latest/config/reverse-proxy.config.php
diff --git a/nextcloud_28-fpm-alpine/config/s3.config.php b/nextcloud_latest/config/s3.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/s3.config.php
copy to nextcloud_latest/config/s3.config.php
diff --git a/nextcloud_28-fpm-alpine/config/smtp.config.php b/nextcloud_latest/config/smtp.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/smtp.config.php
copy to nextcloud_latest/config/smtp.config.php
diff --git a/nextcloud_28-fpm-alpine/config/swift.config.php b/nextcloud_latest/config/swift.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/swift.config.php
copy to nextcloud_latest/config/swift.config.php
diff --git a/nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_latest/config/upgrade-disable-web.config.php
similarity index 100%
copy from nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
copy to nextcloud_latest/config/upgrade-disable-web.config.php
diff --git a/nextcloud_28-fpm-alpine/cron.sh b/nextcloud_latest/cron.sh
similarity index 100%
copy from nextcloud_28-fpm-alpine/cron.sh
copy to nextcloud_latest/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_latest/entrypoint.sh
similarity index 99%
copy from nextcloud_production-fpm-alpine/entrypoint.sh
copy to nextcloud_latest/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_production-fpm-alpine/entrypoint.sh
+++ b/nextcloud_latest/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_28-fpm-alpine/upgrade.exclude b/nextcloud_latest/upgrade.exclude
similarity index 100%
copy from nextcloud_28-fpm-alpine/upgrade.exclude
copy to nextcloud_latest/upgrade.exclude
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 92fc51d..5e8aa0f 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 29.0.7
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.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/entrypoint.sh b/nextcloud_production-fpm-alpine/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_production-fpm-alpine/entrypoint.sh
+++ b/nextcloud_production-fpm-alpine/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 8d8b8bb..a134d72 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 29.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-29.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.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/entrypoint.sh b/nextcloud_production-fpm/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_production-fpm/entrypoint.sh
+++ b/nextcloud_production-fpm/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index d594b56..371d4cd 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 29.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-29.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.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/entrypoint.sh b/nextcloud_production/entrypoint.sh
index 4e06fcc..8e178f2 100755
--- a/nextcloud_production/entrypoint.sh
+++ b/nextcloud_production/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.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

Relevant Maintainers:

@tianon tianon merged commit 39f5ef2 into docker-library:master Sep 18, 2024
14 checks passed
@J0WI J0WI deleted the nextcloud-29.0.7 branch September 18, 2024 21:05
@joshtrichards
Copy link

Thanks, @tianon (and @J0WI)! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants