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

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Update Nextcloud #16353

merged 1 commit into from
Mar 5, 2024

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Mar 4, 2024

PostgreSQL tests are still broken after #16347 😕

Copy link

github-actions bot commented Mar 4, 2024

Diff for 74ab679:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b30b65e..f469dbd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Nextcloud <[email protected]> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 26.0.11-apache, 26.0-apache, 26-apache, 26.0.11, 26.0, 26
+Tags: 26.0.12-apache, 26.0-apache, 26-apache, 26.0.12, 26.0, 26
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 59dd41aaca14d3cd3ddbf072973c1b8a7bc14cc8
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 26/apache
 
-Tags: 26.0.11-fpm, 26.0-fpm, 26-fpm
+Tags: 26.0.12-fpm, 26.0-fpm, 26-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 59dd41aaca14d3cd3ddbf072973c1b8a7bc14cc8
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 26/fpm
 
-Tags: 26.0.11-fpm-alpine, 26.0-fpm-alpine, 26-fpm-alpine
+Tags: 26.0.12-fpm-alpine, 26.0-fpm-alpine, 26-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 59dd41aaca14d3cd3ddbf072973c1b8a7bc14cc8
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 26/fpm-alpine
 
-Tags: 27.1.6-apache, 27.1-apache, 27-apache, stable-apache, production-apache, 27.1.6, 27.1, 27, stable, production
+Tags: 27.1.7-apache, 27.1-apache, 27-apache, 27.1.7, 27.1, 27
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 59dd41aaca14d3cd3ddbf072973c1b8a7bc14cc8
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 27/apache
 
-Tags: 27.1.6-fpm, 27.1-fpm, 27-fpm, stable-fpm, production-fpm
+Tags: 27.1.7-fpm, 27.1-fpm, 27-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 59dd41aaca14d3cd3ddbf072973c1b8a7bc14cc8
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 27/fpm
 
-Tags: 27.1.6-fpm-alpine, 27.1-fpm-alpine, 27-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 27.1.7-fpm-alpine, 27.1-fpm-alpine, 27-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 59dd41aaca14d3cd3ddbf072973c1b8a7bc14cc8
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 27/fpm-alpine
 
-Tags: 28.0.2-apache, 28.0-apache, 28-apache, apache, 28.0.2, 28.0, 28, latest
+Tags: 28.0.3-apache, 28.0-apache, 28-apache, apache, stable-apache, production-apache, 28.0.3, 28.0, 28, latest, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5aa43c00c808791cdd1504998e8cc88365140a60
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 28/apache
 
-Tags: 28.0.2-fpm, 28.0-fpm, 28-fpm, fpm
+Tags: 28.0.3-fpm, 28.0-fpm, 28-fpm, fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5aa43c00c808791cdd1504998e8cc88365140a60
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 28/fpm
 
-Tags: 28.0.2-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine, fpm-alpine
+Tags: 28.0.3-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5aa43c00c808791cdd1504998e8cc88365140a60
+GitCommit: f9ce81fb7fa05e854bbdac7a180b267e2403e93c
 Directory: 28/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 797c421..18d520b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:26.0
 nextcloud:26.0-apache
 nextcloud:26.0-fpm
 nextcloud:26.0-fpm-alpine
-nextcloud:26.0.11
-nextcloud:26.0.11-apache
-nextcloud:26.0.11-fpm
-nextcloud:26.0.11-fpm-alpine
+nextcloud:26.0.12
+nextcloud:26.0.12-apache
+nextcloud:26.0.12-fpm
+nextcloud:26.0.12-fpm-alpine
 nextcloud:27
 nextcloud:27-apache
 nextcloud:27-fpm
@@ -18,10 +18,10 @@ nextcloud:27.1
 nextcloud:27.1-apache
 nextcloud:27.1-fpm
 nextcloud:27.1-fpm-alpine
-nextcloud:27.1.6
-nextcloud:27.1.6-apache
-nextcloud:27.1.6-fpm
-nextcloud:27.1.6-fpm-alpine
+nextcloud:27.1.7
+nextcloud:27.1.7-apache
+nextcloud:27.1.7-fpm
+nextcloud:27.1.7-fpm-alpine
 nextcloud:28
 nextcloud:28-apache
 nextcloud:28-fpm
@@ -30,10 +30,10 @@ nextcloud:28.0
 nextcloud:28.0-apache
 nextcloud:28.0-fpm
 nextcloud:28.0-fpm-alpine
-nextcloud:28.0.2
-nextcloud:28.0.2-apache
-nextcloud:28.0.2-fpm
-nextcloud:28.0.2-fpm-alpine
+nextcloud:28.0.3
+nextcloud:28.0.3-apache
+nextcloud:28.0.3-fpm
+nextcloud:28.0.3-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
diff --git a/nextcloud_26-fpm-alpine/Dockerfile b/nextcloud_26-fpm-alpine/Dockerfile
index 165496d..4c39c6b 100644
--- a/nextcloud_26-fpm-alpine/Dockerfile
+++ b/nextcloud_26-fpm-alpine/Dockerfile
@@ -36,11 +36,13 @@ RUN set -ex; \
         postgresql-dev \
     ; \
     \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -111,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 26.0.11
+ENV NEXTCLOUD_VERSION 26.0.12
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -119,8 +121,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-26.0.11.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-26.0.11.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-26.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-26.0.12.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_26-fpm/Dockerfile b/nextcloud_26-fpm/Dockerfile
index a84adfd..3157410 100644
--- a/nextcloud_26-fpm/Dockerfile
+++ b/nextcloud_26-fpm/Dockerfile
@@ -45,11 +45,13 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -123,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 26.0.11
+ENV NEXTCLOUD_VERSION 26.0.12
 
 RUN set -ex; \
     fetchDeps=" \
@@ -133,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-26.0.11.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-26.0.11.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-26.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-26.0.12.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_26/Dockerfile b/nextcloud_26/Dockerfile
index 1467960..8c11c63 100644
--- a/nextcloud_26/Dockerfile
+++ b/nextcloud_26/Dockerfile
@@ -45,11 +45,13 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -138,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 26.0.11
+ENV NEXTCLOUD_VERSION 26.0.12
 
 RUN set -ex; \
     fetchDeps=" \
@@ -148,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-26.0.11.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-26.0.11.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-26.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-26.0.12.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/Dockerfile b/nextcloud_27-fpm-alpine/Dockerfile
similarity index 95%
rename from nextcloud_fpm-alpine/Dockerfile
rename to nextcloud_27-fpm-alpine/Dockerfile
index c1963ef..f328b4b 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_27-fpm-alpine/Dockerfile
@@ -36,11 +36,13 @@ RUN set -ex; \
         postgresql-dev \
     ; \
     \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -111,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.2
+ENV NEXTCLOUD_VERSION 27.1.7
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -119,8 +121,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.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_fpm-alpine/config/apcu.config.php b/nextcloud_27-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/apcu.config.php
rename to nextcloud_27-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_fpm-alpine/config/apps.config.php b/nextcloud_27-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/apps.config.php
rename to nextcloud_27-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_fpm-alpine/config/autoconfig.php b/nextcloud_27-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/autoconfig.php
rename to nextcloud_27-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_fpm-alpine/config/redis.config.php b/nextcloud_27-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/redis.config.php
rename to nextcloud_27-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_fpm-alpine/config/reverse-proxy.config.php b/nextcloud_27-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_27-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_fpm-alpine/config/s3.config.php b/nextcloud_27-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/s3.config.php
rename to nextcloud_27-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_fpm-alpine/config/smtp.config.php b/nextcloud_27-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/smtp.config.php
rename to nextcloud_27-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_fpm-alpine/config/swift.config.php b/nextcloud_27-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_fpm-alpine/config/swift.config.php
rename to nextcloud_27-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_27-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_27-fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_fpm-alpine/cron.sh b/nextcloud_27-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_fpm-alpine/cron.sh
rename to nextcloud_27-fpm-alpine/cron.sh
diff --git a/nextcloud_fpm-alpine/entrypoint.sh b/nextcloud_27-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_fpm-alpine/entrypoint.sh
rename to nextcloud_27-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_fpm-alpine/upgrade.exclude b/nextcloud_27-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_fpm-alpine/upgrade.exclude
rename to nextcloud_27-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_fpm/Dockerfile b/nextcloud_27-fpm/Dockerfile
similarity index 96%
rename from nextcloud_fpm/Dockerfile
rename to nextcloud_27-fpm/Dockerfile
index e43457d..e888ff3 100644
--- a/nextcloud_fpm/Dockerfile
+++ b/nextcloud_27-fpm/Dockerfile
@@ -45,11 +45,13 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -123,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.2
+ENV NEXTCLOUD_VERSION 27.1.7
 
 RUN set -ex; \
     fetchDeps=" \
@@ -133,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.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.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_fpm/config/apcu.config.php b/nextcloud_27-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_fpm/config/apcu.config.php
rename to nextcloud_27-fpm/config/apcu.config.php
diff --git a/nextcloud_fpm/config/apps.config.php b/nextcloud_27-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_fpm/config/apps.config.php
rename to nextcloud_27-fpm/config/apps.config.php
diff --git a/nextcloud_fpm/config/autoconfig.php b/nextcloud_27-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_fpm/config/autoconfig.php
rename to nextcloud_27-fpm/config/autoconfig.php
diff --git a/nextcloud_fpm/config/redis.config.php b/nextcloud_27-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_fpm/config/redis.config.php
rename to nextcloud_27-fpm/config/redis.config.php
diff --git a/nextcloud_fpm/config/reverse-proxy.config.php b/nextcloud_27-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_fpm/config/reverse-proxy.config.php
rename to nextcloud_27-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_fpm/config/s3.config.php b/nextcloud_27-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_fpm/config/s3.config.php
rename to nextcloud_27-fpm/config/s3.config.php
diff --git a/nextcloud_fpm/config/smtp.config.php b/nextcloud_27-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_fpm/config/smtp.config.php
rename to nextcloud_27-fpm/config/smtp.config.php
diff --git a/nextcloud_fpm/config/swift.config.php b/nextcloud_27-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_fpm/config/swift.config.php
rename to nextcloud_27-fpm/config/swift.config.php
diff --git a/nextcloud_fpm/config/upgrade-disable-web.config.php b/nextcloud_27-fpm/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_fpm/config/upgrade-disable-web.config.php
rename to nextcloud_27-fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_fpm/cron.sh b/nextcloud_27-fpm/cron.sh
similarity index 100%
rename from nextcloud_fpm/cron.sh
rename to nextcloud_27-fpm/cron.sh
diff --git a/nextcloud_fpm/entrypoint.sh b/nextcloud_27-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_fpm/entrypoint.sh
rename to nextcloud_27-fpm/entrypoint.sh
diff --git a/nextcloud_fpm/upgrade.exclude b/nextcloud_27-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_fpm/upgrade.exclude
rename to nextcloud_27-fpm/upgrade.exclude
diff --git a/nextcloud_latest/Dockerfile b/nextcloud_27/Dockerfile
similarity index 96%
rename from nextcloud_latest/Dockerfile
rename to nextcloud_27/Dockerfile
index 91027aa..f696564 100644
--- a/nextcloud_latest/Dockerfile
+++ b/nextcloud_27/Dockerfile
@@ -45,11 +45,13 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -138,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 28.0.2
+ENV NEXTCLOUD_VERSION 27.1.7
 
 RUN set -ex; \
     fetchDeps=" \
@@ -148,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.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.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_latest/config/apache-pretty-urls.config.php b/nextcloud_27/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_latest/config/apache-pretty-urls.config.php
rename to nextcloud_27/config/apache-pretty-urls.config.php
diff --git a/nextcloud_latest/config/apcu.config.php b/nextcloud_27/config/apcu.config.php
similarity index 100%
rename from nextcloud_latest/config/apcu.config.php
rename to nextcloud_27/config/apcu.config.php
diff --git a/nextcloud_latest/config/apps.config.php b/nextcloud_27/config/apps.config.php
similarity index 100%
rename from nextcloud_latest/config/apps.config.php
rename to nextcloud_27/config/apps.config.php
diff --git a/nextcloud_latest/config/autoconfig.php b/nextcloud_27/config/autoconfig.php
similarity index 100%
rename from nextcloud_latest/config/autoconfig.php
rename to nextcloud_27/config/autoconfig.php
diff --git a/nextcloud_latest/config/redis.config.php b/nextcloud_27/config/redis.config.php
similarity index 100%
rename from nextcloud_latest/config/redis.config.php
rename to nextcloud_27/config/redis.config.php
diff --git a/nextcloud_latest/config/reverse-proxy.config.php b/nextcloud_27/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_latest/config/reverse-proxy.config.php
rename to nextcloud_27/config/reverse-proxy.config.php
diff --git a/nextcloud_latest/config/s3.config.php b/nextcloud_27/config/s3.config.php
similarity index 100%
rename from nextcloud_latest/config/s3.config.php
rename to nextcloud_27/config/s3.config.php
diff --git a/nextcloud_latest/config/smtp.config.php b/nextcloud_27/config/smtp.config.php
similarity index 100%
rename from nextcloud_latest/config/smtp.config.php
rename to nextcloud_27/config/smtp.config.php
diff --git a/nextcloud_latest/config/swift.config.php b/nextcloud_27/config/swift.config.php
similarity index 100%
rename from nextcloud_latest/config/swift.config.php
rename to nextcloud_27/config/swift.config.php
diff --git a/nextcloud_latest/config/upgrade-disable-web.config.php b/nextcloud_27/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_latest/config/upgrade-disable-web.config.php
rename to nextcloud_27/config/upgrade-disable-web.config.php
diff --git a/nextcloud_latest/cron.sh b/nextcloud_27/cron.sh
similarity index 100%
rename from nextcloud_latest/cron.sh
rename to nextcloud_27/cron.sh
diff --git a/nextcloud_latest/entrypoint.sh b/nextcloud_27/entrypoint.sh
similarity index 100%
rename from nextcloud_latest/entrypoint.sh
rename to nextcloud_27/entrypoint.sh
diff --git a/nextcloud_latest/upgrade.exclude b/nextcloud_27/upgrade.exclude
similarity index 100%
rename from nextcloud_latest/upgrade.exclude
rename to nextcloud_27/upgrade.exclude
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 1454655..831d98b 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -36,11 +36,13 @@ RUN set -ex; \
         postgresql-dev \
     ; \
     \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -111,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 27.1.6
+ENV NEXTCLOUD_VERSION 28.0.3
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -119,8 +121,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.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_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 7f6d0b4..afd78ba 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -45,11 +45,13 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -123,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 27.1.6
+ENV NEXTCLOUD_VERSION 28.0.3
 
 RUN set -ex; \
     fetchDeps=" \
@@ -133,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.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.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_production/Dockerfile b/nextcloud_production/Dockerfile
index 14bd575..87a1e99 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -45,11 +45,13 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure ftp --with-openssl-dir=/usr; \
     docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
     docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
     docker-php-ext-install -j "$(nproc)" \
         bcmath \
         exif \
+        ftp \
         gd \
         gmp \
         intl \
@@ -138,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 27.1.6
+ENV NEXTCLOUD_VERSION 28.0.3
 
 RUN set -ex; \
     fetchDeps=" \
@@ -148,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.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.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; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 58b52c2 into docker-library:master Mar 5, 2024
14 checks passed
@J0WI J0WI deleted the nextcloud-28.0.3 branch March 5, 2024 22:50
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.

None yet

2 participants