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 #17220

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update Nextcloud #17220

merged 1 commit into from
Jul 22, 2024

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Jul 22, 2024

No description provided.

@J0WI J0WI requested a review from a team as a code owner July 22, 2024 11:58
Copy link

Diff for 90e7cb2:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8094c4d..0966300 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,45 +3,45 @@ GitRepo: https://github.com/nextcloud/docker.git
 
 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: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: f02b8b04e3017a4b601d41354f29d5039f3e10c0
 Directory: 27/apache
 
 Tags: 27.1.11-fpm, 27.1-fpm, 27-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: f02b8b04e3017a4b601d41354f29d5039f3e10c0
 Directory: 27/fpm
 
 Tags: 27.1.11-fpm-alpine, 27.1-fpm-alpine, 27-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 08596d2c3e93e652a77c90b4274aaf04c76a9537
+GitCommit: f02b8b04e3017a4b601d41354f29d5039f3e10c0
 Directory: 27/fpm-alpine
 
-Tags: 28.0.7-apache, 28.0-apache, 28-apache, stable-apache, production-apache, 28.0.7, 28.0, 28, stable, production
+Tags: 28.0.8-apache, 28.0-apache, 28-apache, 28.0.8, 28.0, 28
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 258cc4ee2d0c4778f67b7b82066ad22dcdb6633f
 Directory: 28/apache
 
-Tags: 28.0.7-fpm, 28.0-fpm, 28-fpm, stable-fpm, production-fpm
+Tags: 28.0.8-fpm, 28.0-fpm, 28-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 258cc4ee2d0c4778f67b7b82066ad22dcdb6633f
 Directory: 28/fpm
 
-Tags: 28.0.7-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 28.0.8-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 08596d2c3e93e652a77c90b4274aaf04c76a9537
+GitCommit: 258cc4ee2d0c4778f67b7b82066ad22dcdb6633f
 Directory: 28/fpm-alpine
 
-Tags: 29.0.3-apache, 29.0-apache, 29-apache, apache, 29.0.3, 29.0, 29, latest
+Tags: 29.0.4-apache, 29.0-apache, 29-apache, apache, stable-apache, production-apache, 29.0.4, 29.0, 29, latest, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 258cc4ee2d0c4778f67b7b82066ad22dcdb6633f
 Directory: 29/apache
 
-Tags: 29.0.3-fpm, 29.0-fpm, 29-fpm, fpm
+Tags: 29.0.4-fpm, 29.0-fpm, 29-fpm, fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 258cc4ee2d0c4778f67b7b82066ad22dcdb6633f
 Directory: 29/fpm
 
-Tags: 29.0.3-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, fpm-alpine
+Tags: 29.0.4-fpm-alpine, 29.0-fpm-alpine, 29-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 08596d2c3e93e652a77c90b4274aaf04c76a9537
+GitCommit: 258cc4ee2d0c4778f67b7b82066ad22dcdb6633f
 Directory: 29/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index a6dbafb..844c16e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,10 +18,10 @@ nextcloud:28.0
 nextcloud:28.0-apache
 nextcloud:28.0-fpm
 nextcloud:28.0-fpm-alpine
-nextcloud:28.0.7
-nextcloud:28.0.7-apache
-nextcloud:28.0.7-fpm
-nextcloud:28.0.7-fpm-alpine
+nextcloud:28.0.8
+nextcloud:28.0.8-apache
+nextcloud:28.0.8-fpm
+nextcloud:28.0.8-fpm-alpine
 nextcloud:29
 nextcloud:29-apache
 nextcloud:29-fpm
@@ -30,10 +30,10 @@ nextcloud:29.0
 nextcloud:29.0-apache
 nextcloud:29.0-fpm
 nextcloud:29.0-fpm-alpine
-nextcloud:29.0.3
-nextcloud:29.0.3-apache
-nextcloud:29.0.3-fpm
-nextcloud:29.0.3-fpm-alpine
+nextcloud:29.0.4
+nextcloud:29.0.4-apache
+nextcloud:29.0.4-fpm
+nextcloud:29.0.4-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ea66acb..09d335d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
 nextcloud:27
 nextcloud:27-fpm
 nextcloud:27-fpm-alpine
-nextcloud:fpm
-nextcloud:fpm-alpine
-nextcloud:latest
+nextcloud:28
+nextcloud:28-fpm
+nextcloud:28-fpm-alpine
 nextcloud:production
 nextcloud:production-fpm
 nextcloud:production-fpm-alpine
diff --git a/nextcloud_27-fpm-alpine/entrypoint.sh b/nextcloud_27-fpm-alpine/entrypoint.sh
index 1c60984..4e06fcc 100755
--- a/nextcloud_27-fpm-alpine/entrypoint.sh
+++ b/nextcloud_27-fpm-alpine/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_27-fpm/entrypoint.sh b/nextcloud_27-fpm/entrypoint.sh
index 1c60984..4e06fcc 100755
--- a/nextcloud_27-fpm/entrypoint.sh
+++ b/nextcloud_27-fpm/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_27/entrypoint.sh b/nextcloud_27/entrypoint.sh
index 1c60984..4e06fcc 100755
--- a/nextcloud_27/entrypoint.sh
+++ b/nextcloud_27/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_fpm-alpine/Dockerfile b/nextcloud_28-fpm-alpine/Dockerfile
similarity index 97%
rename from nextcloud_fpm-alpine/Dockerfile
rename to nextcloud_28-fpm-alpine/Dockerfile
index 995c908..1c0df0a 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_28-fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.3
+ENV NEXTCLOUD_VERSION 28.0.8
 
 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.3.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.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/config/apcu.config.php b/nextcloud_28-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/apcu.config.php
rename to nextcloud_28-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_fpm-alpine/config/apps.config.php b/nextcloud_28-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/apps.config.php
rename to nextcloud_28-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_fpm-alpine/config/autoconfig.php b/nextcloud_28-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/autoconfig.php
rename to nextcloud_28-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_fpm-alpine/config/redis.config.php b/nextcloud_28-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/redis.config.php
rename to nextcloud_28-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_fpm-alpine/config/reverse-proxy.config.php b/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_fpm-alpine/config/s3.config.php b/nextcloud_28-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/s3.config.php
rename to nextcloud_28-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_fpm-alpine/config/smtp.config.php b/nextcloud_28-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/smtp.config.php
rename to nextcloud_28-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_fpm-alpine/config/swift.config.php b/nextcloud_28-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/swift.config.php
rename to nextcloud_28-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_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_fpm-alpine/config/upgrade-disable-web.config.php
rename to nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_fpm-alpine/cron.sh b/nextcloud_28-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_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 98%
copy from nextcloud_fpm-alpine/entrypoint.sh
copy to nextcloud_28-fpm-alpine/entrypoint.sh
index 1c60984..4e06fcc 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_28-fpm-alpine/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_fpm-alpine/upgrade.exclude b/nextcloud_28-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_fpm-alpine/upgrade.exclude
rename to nextcloud_28-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_28-fpm/Dockerfile
similarity index 97%
rename from nextcloud_fpm/Dockerfile
rename to nextcloud_28-fpm/Dockerfile
index 5bba909..593beb1 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_28-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.3
+ENV NEXTCLOUD_VERSION 28.0.8
 
 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.3.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.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/config/apcu.config.php b/nextcloud_28-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_fpm/config/apcu.config.php
rename to nextcloud_28-fpm/config/apcu.config.php
diff --git a/nextcloud_fpm/config/apps.config.php b/nextcloud_28-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_fpm/config/apps.config.php
rename to nextcloud_28-fpm/config/apps.config.php
diff --git a/nextcloud_fpm/config/autoconfig.php b/nextcloud_28-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_fpm/config/autoconfig.php
rename to nextcloud_28-fpm/config/autoconfig.php
diff --git a/nextcloud_fpm/config/redis.config.php b/nextcloud_28-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_fpm/config/redis.config.php
rename to nextcloud_28-fpm/config/redis.config.php
diff --git a/nextcloud_fpm/config/reverse-proxy.config.php b/nextcloud_28-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_fpm/config/reverse-proxy.config.php
rename to nextcloud_28-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_fpm/config/s3.config.php b/nextcloud_28-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_fpm/config/s3.config.php
rename to nextcloud_28-fpm/config/s3.config.php
diff --git a/nextcloud_fpm/config/smtp.config.php b/nextcloud_28-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_fpm/config/smtp.config.php
rename to nextcloud_28-fpm/config/smtp.config.php
diff --git a/nextcloud_fpm/config/swift.config.php b/nextcloud_28-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_fpm/config/swift.config.php
rename to nextcloud_28-fpm/config/swift.config.php
diff --git a/nextcloud_fpm/config/upgrade-disable-web.config.php b/nextcloud_28-fpm/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_fpm/config/upgrade-disable-web.config.php
rename to nextcloud_28-fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_fpm/cron.sh b/nextcloud_28-fpm/cron.sh
similarity index 100%
rename from nextcloud_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 98%
copy from nextcloud_fpm-alpine/entrypoint.sh
copy to nextcloud_28-fpm/entrypoint.sh
index 1c60984..4e06fcc 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_28-fpm/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_fpm/upgrade.exclude b/nextcloud_28-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_fpm/upgrade.exclude
rename to nextcloud_28-fpm/upgrade.exclude
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_28/Dockerfile
similarity index 97%
rename from nextcloud_latest/Dockerfile
rename to nextcloud_28/Dockerfile
index 40b7c93..c4089c5 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_28/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 29.0.3
+ENV NEXTCLOUD_VERSION 28.0.8
 
 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.3.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.3.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.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/config/apache-pretty-urls.config.php b/nextcloud_28/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_latest/config/apache-pretty-urls.config.php
rename to nextcloud_28/config/apache-pretty-urls.config.php
diff --git a/nextcloud_latest/config/apcu.config.php b/nextcloud_28/config/apcu.config.php
similarity index 100%
rename from nextcloud_latest/config/apcu.config.php
rename to nextcloud_28/config/apcu.config.php
diff --git a/nextcloud_latest/config/apps.config.php b/nextcloud_28/config/apps.config.php
similarity index 100%
rename from nextcloud_latest/config/apps.config.php
rename to nextcloud_28/config/apps.config.php
diff --git a/nextcloud_latest/config/autoconfig.php b/nextcloud_28/config/autoconfig.php
similarity index 100%
rename from nextcloud_latest/config/autoconfig.php
rename to nextcloud_28/config/autoconfig.php
diff --git a/nextcloud_latest/config/redis.config.php b/nextcloud_28/config/redis.config.php
similarity index 100%
rename from nextcloud_latest/config/redis.config.php
rename to nextcloud_28/config/redis.config.php
diff --git a/nextcloud_latest/config/reverse-proxy.config.php b/nextcloud_28/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_latest/config/reverse-proxy.config.php
rename to nextcloud_28/config/reverse-proxy.config.php
diff --git a/nextcloud_latest/config/s3.config.php b/nextcloud_28/config/s3.config.php
similarity index 100%
rename from nextcloud_latest/config/s3.config.php
rename to nextcloud_28/config/s3.config.php
diff --git a/nextcloud_latest/config/smtp.config.php b/nextcloud_28/config/smtp.config.php
similarity index 100%
rename from nextcloud_latest/config/smtp.config.php
rename to nextcloud_28/config/smtp.config.php
diff --git a/nextcloud_latest/config/swift.config.php b/nextcloud_28/config/swift.config.php
similarity index 100%
rename from nextcloud_latest/config/swift.config.php
rename to nextcloud_28/config/swift.config.php
diff --git a/nextcloud_latest/config/upgrade-disable-web.config.php b/nextcloud_28/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_latest/config/upgrade-disable-web.config.php
rename to nextcloud_28/config/upgrade-disable-web.config.php
diff --git a/nextcloud_latest/cron.sh b/nextcloud_28/cron.sh
similarity index 100%
rename from nextcloud_latest/cron.sh
rename to nextcloud_28/cron.sh
diff --git a/nextcloud_fpm-alpine/entrypoint.sh b/nextcloud_28/entrypoint.sh
similarity index 98%
rename from nextcloud_fpm-alpine/entrypoint.sh
rename to nextcloud_28/entrypoint.sh
index 1c60984..4e06fcc 100755
--- a/nextcloud_fpm-alpine/entrypoint.sh
+++ b/nextcloud_28/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_latest/upgrade.exclude b/nextcloud_28/upgrade.exclude
similarity index 100%
rename from nextcloud_latest/upgrade.exclude
rename to nextcloud_28/upgrade.exclude
diff --git a/nextcloud_fpm/entrypoint.sh b/nextcloud_fpm/entrypoint.sh
deleted file mode 100755
index 1c60984..0000000
diff --git a/nextcloud_latest/entrypoint.sh b/nextcloud_latest/entrypoint.sh
deleted file mode 100755
index 1c60984..0000000
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index ae4c183..d36b0c9 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 28.0.7
+ENV NEXTCLOUD_VERSION 29.0.4
 
 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.7.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.4.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 1c60984..4e06fcc 100755
--- a/nextcloud_production-fpm-alpine/entrypoint.sh
+++ b/nextcloud_production-fpm-alpine/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 83c009f..8dc9a1f 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.7
+ENV NEXTCLOUD_VERSION 29.0.4
 
 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.7.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.4.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 1c60984..4e06fcc 100755
--- a/nextcloud_production-fpm/entrypoint.sh
+++ b/nextcloud_production-fpm/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index 2ea543a..1255baf 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 28.0.7
+ENV NEXTCLOUD_VERSION 29.0.4
 
 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.7.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.4.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 1c60984..4e06fcc 100755
--- a/nextcloud_production/entrypoint.sh
+++ b/nextcloud_production/entrypoint.sh
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                         echo "Starting nextcloud installation"
                         max_retries=10
                         try=0
-                        until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+                        until  [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" 
                         do
                             echo "Retrying install..."
                             try=$((try+1))

Relevant Maintainers:

@tianon tianon merged commit 9cca4ec into docker-library:master Jul 22, 2024
14 checks passed
@J0WI J0WI deleted the nextcloud-29.0.4 branch July 24, 2024 22:09
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.

2 participants