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

Merged
merged 1 commit into from
Jul 3, 2024
Merged

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Jul 3, 2024

No description provided.

@J0WI J0WI requested a review from a team as a code owner July 3, 2024 00:18
Copy link

github-actions bot commented Jul 3, 2024

Diff for 2cae8b6:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bffef48..8094c4d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,22 +13,22 @@ 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: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 08596d2c3e93e652a77c90b4274aaf04c76a9537
 Directory: 27/fpm-alpine
 
-Tags: 28.0.7-apache, 28.0-apache, 28-apache, 28.0.7, 28.0, 28
+Tags: 28.0.7-apache, 28.0-apache, 28-apache, stable-apache, production-apache, 28.0.7, 28.0, 28, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 28/apache
 
-Tags: 28.0.7-fpm, 28.0-fpm, 28-fpm
+Tags: 28.0.7-fpm, 28.0-fpm, 28-fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: cd162a43212520628036e13fbfc1aba201139005
 Directory: 28/fpm
 
-Tags: 28.0.7-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine
+Tags: 28.0.7-fpm-alpine, 28.0-fpm-alpine, 28-fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 08596d2c3e93e652a77c90b4274aaf04c76a9537
 Directory: 28/fpm-alpine
 
 Tags: 29.0.3-apache, 29.0-apache, 29-apache, apache, 29.0.3, 29.0, 29, latest
@@ -43,5 +43,5 @@ Directory: 29/fpm
 
 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: cd162a43212520628036e13fbfc1aba201139005
+GitCommit: 08596d2c3e93e652a77c90b4274aaf04c76a9537
 Directory: 29/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 9b730f6..a6dbafb 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -38,3 +38,11 @@ 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/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ae6a4e4..ea66acb 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: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_27-fpm-alpine/Dockerfile b/nextcloud_27-fpm-alpine/Dockerfile
index 9ed2936..3f9ebe6 100644
--- a/nextcloud_27-fpm-alpine/Dockerfile
+++ b/nextcloud_27-fpm-alpine/Dockerfile
@@ -6,6 +6,13 @@ RUN set -ex; \
     \
     apk add --no-cache \
         imagemagick \
+        imagemagick-pdf \
+        imagemagick-jpeg \
+        imagemagick-raw \
+        imagemagick-tiff \
+        imagemagick-heic \
+        imagemagick-webp \
+        imagemagick-svg \
         rsync \
     ; \
     \
diff --git a/nextcloud_fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
index 48aa3db..995c908 100644
--- a/nextcloud_fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -6,6 +6,13 @@ RUN set -ex; \
     \
     apk add --no-cache \
         imagemagick \
+        imagemagick-pdf \
+        imagemagick-jpeg \
+        imagemagick-raw \
+        imagemagick-tiff \
+        imagemagick-heic \
+        imagemagick-webp \
+        imagemagick-svg \
         rsync \
     ; \
     \
diff --git a/nextcloud_28-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
similarity index 96%
rename from nextcloud_28-fpm-alpine/Dockerfile
rename to nextcloud_production-fpm-alpine/Dockerfile
index 63090ee..ae4c183 100644
--- a/nextcloud_28-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -6,6 +6,13 @@ RUN set -ex; \
     \
     apk add --no-cache \
         imagemagick \
+        imagemagick-pdf \
+        imagemagick-jpeg \
+        imagemagick-raw \
+        imagemagick-tiff \
+        imagemagick-heic \
+        imagemagick-webp \
+        imagemagick-svg \
         rsync \
     ; \
     \
diff --git a/nextcloud_28-fpm-alpine/config/apcu.config.php b/nextcloud_production-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/apcu.config.php
rename to nextcloud_production-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_28-fpm-alpine/config/apps.config.php b/nextcloud_production-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/apps.config.php
rename to nextcloud_production-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_28-fpm-alpine/config/autoconfig.php b/nextcloud_production-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/autoconfig.php
rename to nextcloud_production-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_28-fpm-alpine/config/redis.config.php b/nextcloud_production-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/redis.config.php
rename to nextcloud_production-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_28-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_28-fpm-alpine/config/s3.config.php b/nextcloud_production-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/s3.config.php
rename to nextcloud_production-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_28-fpm-alpine/config/smtp.config.php b/nextcloud_production-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/smtp.config.php
rename to nextcloud_production-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_28-fpm-alpine/config/swift.config.php b/nextcloud_production-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/swift.config.php
rename to nextcloud_production-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php b/nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_28-fpm-alpine/config/upgrade-disable-web.config.php
rename to nextcloud_production-fpm-alpine/config/upgrade-disable-web.config.php
diff --git a/nextcloud_28-fpm-alpine/cron.sh b/nextcloud_production-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_28-fpm-alpine/cron.sh
rename to nextcloud_production-fpm-alpine/cron.sh
diff --git a/nextcloud_28-fpm-alpine/entrypoint.sh b/nextcloud_production-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_28-fpm-alpine/entrypoint.sh
rename to nextcloud_production-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_28-fpm-alpine/upgrade.exclude b/nextcloud_production-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_28-fpm-alpine/upgrade.exclude
rename to nextcloud_production-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_28-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
similarity index 100%
rename from nextcloud_28-fpm/Dockerfile
rename to nextcloud_production-fpm/Dockerfile
diff --git a/nextcloud_28-fpm/config/apcu.config.php b/nextcloud_production-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/apcu.config.php
rename to nextcloud_production-fpm/config/apcu.config.php
diff --git a/nextcloud_28-fpm/config/apps.config.php b/nextcloud_production-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/apps.config.php
rename to nextcloud_production-fpm/config/apps.config.php
diff --git a/nextcloud_28-fpm/config/autoconfig.php b/nextcloud_production-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_28-fpm/config/autoconfig.php
rename to nextcloud_production-fpm/config/autoconfig.php
diff --git a/nextcloud_28-fpm/config/redis.config.php b/nextcloud_production-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/redis.config.php
rename to nextcloud_production-fpm/config/redis.config.php
diff --git a/nextcloud_28-fpm/config/reverse-proxy.config.php b/nextcloud_production-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/reverse-proxy.config.php
rename to nextcloud_production-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_28-fpm/config/s3.config.php b/nextcloud_production-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/s3.config.php
rename to nextcloud_production-fpm/config/s3.config.php
diff --git a/nextcloud_28-fpm/config/smtp.config.php b/nextcloud_production-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/smtp.config.php
rename to nextcloud_production-fpm/config/smtp.config.php
diff --git a/nextcloud_28-fpm/config/swift.config.php b/nextcloud_production-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/swift.config.php
rename to nextcloud_production-fpm/config/swift.config.php
diff --git a/nextcloud_28-fpm/config/upgrade-disable-web.config.php b/nextcloud_production-fpm/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_28-fpm/config/upgrade-disable-web.config.php
rename to nextcloud_production-fpm/config/upgrade-disable-web.config.php
diff --git a/nextcloud_28-fpm/cron.sh b/nextcloud_production-fpm/cron.sh
similarity index 100%
rename from nextcloud_28-fpm/cron.sh
rename to nextcloud_production-fpm/cron.sh
diff --git a/nextcloud_28-fpm/entrypoint.sh b/nextcloud_production-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_28-fpm/entrypoint.sh
rename to nextcloud_production-fpm/entrypoint.sh
diff --git a/nextcloud_28-fpm/upgrade.exclude b/nextcloud_production-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_28-fpm/upgrade.exclude
rename to nextcloud_production-fpm/upgrade.exclude
diff --git a/nextcloud_28/Dockerfile b/nextcloud_production/Dockerfile
similarity index 100%
rename from nextcloud_28/Dockerfile
rename to nextcloud_production/Dockerfile
diff --git a/nextcloud_28/config/apache-pretty-urls.config.php b/nextcloud_production/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_28/config/apache-pretty-urls.config.php
rename to nextcloud_production/config/apache-pretty-urls.config.php
diff --git a/nextcloud_28/config/apcu.config.php b/nextcloud_production/config/apcu.config.php
similarity index 100%
rename from nextcloud_28/config/apcu.config.php
rename to nextcloud_production/config/apcu.config.php
diff --git a/nextcloud_28/config/apps.config.php b/nextcloud_production/config/apps.config.php
similarity index 100%
rename from nextcloud_28/config/apps.config.php
rename to nextcloud_production/config/apps.config.php
diff --git a/nextcloud_28/config/autoconfig.php b/nextcloud_production/config/autoconfig.php
similarity index 100%
rename from nextcloud_28/config/autoconfig.php
rename to nextcloud_production/config/autoconfig.php
diff --git a/nextcloud_28/config/redis.config.php b/nextcloud_production/config/redis.config.php
similarity index 100%
rename from nextcloud_28/config/redis.config.php
rename to nextcloud_production/config/redis.config.php
diff --git a/nextcloud_28/config/reverse-proxy.config.php b/nextcloud_production/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_28/config/reverse-proxy.config.php
rename to nextcloud_production/config/reverse-proxy.config.php
diff --git a/nextcloud_28/config/s3.config.php b/nextcloud_production/config/s3.config.php
similarity index 100%
rename from nextcloud_28/config/s3.config.php
rename to nextcloud_production/config/s3.config.php
diff --git a/nextcloud_28/config/smtp.config.php b/nextcloud_production/config/smtp.config.php
similarity index 100%
rename from nextcloud_28/config/smtp.config.php
rename to nextcloud_production/config/smtp.config.php
diff --git a/nextcloud_28/config/swift.config.php b/nextcloud_production/config/swift.config.php
similarity index 100%
rename from nextcloud_28/config/swift.config.php
rename to nextcloud_production/config/swift.config.php
diff --git a/nextcloud_28/config/upgrade-disable-web.config.php b/nextcloud_production/config/upgrade-disable-web.config.php
similarity index 100%
rename from nextcloud_28/config/upgrade-disable-web.config.php
rename to nextcloud_production/config/upgrade-disable-web.config.php
diff --git a/nextcloud_28/cron.sh b/nextcloud_production/cron.sh
similarity index 100%
rename from nextcloud_28/cron.sh
rename to nextcloud_production/cron.sh
diff --git a/nextcloud_28/entrypoint.sh b/nextcloud_production/entrypoint.sh
similarity index 100%
rename from nextcloud_28/entrypoint.sh
rename to nextcloud_production/entrypoint.sh
diff --git a/nextcloud_28/upgrade.exclude b/nextcloud_production/upgrade.exclude
similarity index 100%
rename from nextcloud_28/upgrade.exclude
rename to nextcloud_production/upgrade.exclude

Relevant Maintainers:

@tianon tianon merged commit 78e80f1 into docker-library:master Jul 3, 2024
14 checks passed
@J0WI J0WI deleted the nextcloud-stable-28.0.7 branch July 7, 2024 12:02
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