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

Merged
merged 1 commit into from
Nov 12, 2021
Merged

Update Nextcloud #11290

merged 1 commit into from
Nov 12, 2021

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Nov 12, 2021

No description provided.

@github-actions
Copy link

Diff for a342efa:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 023cbd5..5521b2c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Nextcloud <docker@nextcloud.com> (@nextcloud)
 GitRepo: https://github.com/nextcloud/docker.git
 
-Tags: 20.0.13-apache, 20.0-apache, 20-apache, 20.0.13, 20.0, 20
+Tags: 20.0.14-apache, 20.0-apache, 20-apache, 20.0.14, 20.0, 20
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dd37882f3e12f80395b2f6b33ba67f02e3d0c388
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 20/apache
 
-Tags: 20.0.13-fpm, 20.0-fpm, 20-fpm
+Tags: 20.0.14-fpm, 20.0-fpm, 20-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dd37882f3e12f80395b2f6b33ba67f02e3d0c388
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 20/fpm
 
-Tags: 20.0.13-fpm-alpine, 20.0-fpm-alpine, 20-fpm-alpine
+Tags: 20.0.14-fpm-alpine, 20.0-fpm-alpine, 20-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2163ed293a651173d6aa1e45e238590a6faeb042
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 20/fpm-alpine
 
-Tags: 21.0.5-apache, 21.0-apache, 21-apache, 21.0.5, 21.0, 21
+Tags: 21.0.6-apache, 21.0-apache, 21-apache, 21.0.6, 21.0, 21
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dd37882f3e12f80395b2f6b33ba67f02e3d0c388
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 21/apache
 
-Tags: 21.0.5-fpm, 21.0-fpm, 21-fpm
+Tags: 21.0.6-fpm, 21.0-fpm, 21-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dd37882f3e12f80395b2f6b33ba67f02e3d0c388
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 21/fpm
 
-Tags: 21.0.5-fpm-alpine, 21.0-fpm-alpine, 21-fpm-alpine
+Tags: 21.0.6-fpm-alpine, 21.0-fpm-alpine, 21-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2163ed293a651173d6aa1e45e238590a6faeb042
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 21/fpm-alpine
 
-Tags: 22.2.0-apache, 22.2-apache, 22-apache, apache, stable-apache, production-apache, 22.2.0, 22.2, 22, latest, stable, production
+Tags: 22.2.1-apache, 22.2-apache, 22-apache, apache, 22.2.1, 22.2, 22, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dd37882f3e12f80395b2f6b33ba67f02e3d0c388
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 22/apache
 
-Tags: 22.2.0-fpm, 22.2-fpm, 22-fpm, fpm, stable-fpm, production-fpm
+Tags: 22.2.1-fpm, 22.2-fpm, 22-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: dd37882f3e12f80395b2f6b33ba67f02e3d0c388
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 22/fpm
 
-Tags: 22.2.0-fpm-alpine, 22.2-fpm-alpine, 22-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
+Tags: 22.2.1-fpm-alpine, 22.2-fpm-alpine, 22-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 2163ed293a651173d6aa1e45e238590a6faeb042
+GitCommit: 7fc6772513dd0da3b790dac4fcdc2e7b90a72546
 Directory: 22/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 597c22c..8b2cf48 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,10 +6,10 @@ nextcloud:20.0
 nextcloud:20.0-apache
 nextcloud:20.0-fpm
 nextcloud:20.0-fpm-alpine
-nextcloud:20.0.13
-nextcloud:20.0.13-apache
-nextcloud:20.0.13-fpm
-nextcloud:20.0.13-fpm-alpine
+nextcloud:20.0.14
+nextcloud:20.0.14-apache
+nextcloud:20.0.14-fpm
+nextcloud:20.0.14-fpm-alpine
 nextcloud:21
 nextcloud:21-apache
 nextcloud:21-fpm
@@ -18,10 +18,10 @@ nextcloud:21.0
 nextcloud:21.0-apache
 nextcloud:21.0-fpm
 nextcloud:21.0-fpm-alpine
-nextcloud:21.0.5
-nextcloud:21.0.5-apache
-nextcloud:21.0.5-fpm
-nextcloud:21.0.5-fpm-alpine
+nextcloud:21.0.6
+nextcloud:21.0.6-apache
+nextcloud:21.0.6-fpm
+nextcloud:21.0.6-fpm-alpine
 nextcloud:22
 nextcloud:22-apache
 nextcloud:22-fpm
@@ -30,19 +30,11 @@ nextcloud:22.2
 nextcloud:22.2-apache
 nextcloud:22.2-fpm
 nextcloud:22.2-fpm-alpine
-nextcloud:22.2.0
-nextcloud:22.2.0-apache
-nextcloud:22.2.0-fpm
-nextcloud:22.2.0-fpm-alpine
+nextcloud:22.2.1
+nextcloud:22.2.1-apache
+nextcloud:22.2.1-fpm
+nextcloud:22.2.1-fpm-alpine
 nextcloud:apache
 nextcloud:fpm
 nextcloud:fpm-alpine
 nextcloud:latest
-nextcloud:production
-nextcloud:production-apache
-nextcloud:production-fpm
-nextcloud:production-fpm-alpine
-nextcloud:stable
-nextcloud:stable-apache
-nextcloud:stable-fpm
-nextcloud:stable-fpm-alpine
diff --git a/nextcloud_20-fpm-alpine/Dockerfile b/nextcloud_20-fpm-alpine/Dockerfile
index d9a0971..9453bca 100644
--- a/nextcloud_20-fpm-alpine/Dockerfile
+++ b/nextcloud_20-fpm-alpine/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.13
+ENV NEXTCLOUD_VERSION 20.0.14
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_20-fpm/Dockerfile b/nextcloud_20-fpm/Dockerfile
index 641d761..e3255c8 100644
--- a/nextcloud_20-fpm/Dockerfile
+++ b/nextcloud_20-fpm/Dockerfile
@@ -114,7 +114,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.13
+ENV NEXTCLOUD_VERSION 20.0.14
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_20/Dockerfile b/nextcloud_20/Dockerfile
index 2645c05..0436791 100644
--- a/nextcloud_20/Dockerfile
+++ b/nextcloud_20/Dockerfile
@@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 20.0.13
+ENV NEXTCLOUD_VERSION 20.0.14
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_21-fpm-alpine/Dockerfile b/nextcloud_21-fpm-alpine/Dockerfile
index 1af397a..1ccf31b 100644
--- a/nextcloud_21-fpm-alpine/Dockerfile
+++ b/nextcloud_21-fpm-alpine/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.5
+ENV NEXTCLOUD_VERSION 21.0.6
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_21-fpm/Dockerfile b/nextcloud_21-fpm/Dockerfile
index 49a0cf8..f769fc6 100644
--- a/nextcloud_21-fpm/Dockerfile
+++ b/nextcloud_21-fpm/Dockerfile
@@ -114,7 +114,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.5
+ENV NEXTCLOUD_VERSION 21.0.6
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_21/Dockerfile b/nextcloud_21/Dockerfile
index 8f6f641..b47234f 100644
--- a/nextcloud_21/Dockerfile
+++ b/nextcloud_21/Dockerfile
@@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 21.0.5
+ENV NEXTCLOUD_VERSION 21.0.6
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_fpm-alpine/Dockerfile
similarity index 99%
rename from nextcloud_production-fpm-alpine/Dockerfile
rename to nextcloud_fpm-alpine/Dockerfile
index ca36300..e65ae75 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_fpm-alpine/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.2.0
+ENV NEXTCLOUD_VERSION 22.2.1
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_production-fpm-alpine/config/apcu.config.php b/nextcloud_fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apcu.config.php
rename to nextcloud_fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_production-fpm-alpine/config/apps.config.php b/nextcloud_fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/apps.config.php
rename to nextcloud_fpm-alpine/config/apps.config.php
diff --git a/nextcloud_production-fpm-alpine/config/autoconfig.php b/nextcloud_fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/autoconfig.php
rename to nextcloud_fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_production-fpm-alpine/config/redis.config.php b/nextcloud_fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/redis.config.php
rename to nextcloud_fpm-alpine/config/redis.config.php
diff --git a/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm-alpine/config/s3.config.php b/nextcloud_fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/s3.config.php
rename to nextcloud_fpm-alpine/config/s3.config.php
diff --git a/nextcloud_production-fpm-alpine/config/smtp.config.php b/nextcloud_fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/smtp.config.php
rename to nextcloud_fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_production-fpm-alpine/config/swift.config.php b/nextcloud_fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm-alpine/config/swift.config.php
rename to nextcloud_fpm-alpine/config/swift.config.php
diff --git a/nextcloud_production-fpm-alpine/cron.sh b/nextcloud_fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/cron.sh
rename to nextcloud_fpm-alpine/cron.sh
diff --git a/nextcloud_production-fpm-alpine/entrypoint.sh b/nextcloud_fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm-alpine/entrypoint.sh
rename to nextcloud_fpm-alpine/entrypoint.sh
diff --git a/nextcloud_production-fpm-alpine/upgrade.exclude b/nextcloud_fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm-alpine/upgrade.exclude
rename to nextcloud_fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_fpm/Dockerfile
similarity index 99%
rename from nextcloud_production-fpm/Dockerfile
rename to nextcloud_fpm/Dockerfile
index f181f1c..25ae654 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_fpm/Dockerfile
@@ -114,7 +114,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.2.0
+ENV NEXTCLOUD_VERSION 22.2.1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production-fpm/config/apcu.config.php b/nextcloud_fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apcu.config.php
rename to nextcloud_fpm/config/apcu.config.php
diff --git a/nextcloud_production-fpm/config/apps.config.php b/nextcloud_fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/apps.config.php
rename to nextcloud_fpm/config/apps.config.php
diff --git a/nextcloud_production-fpm/config/autoconfig.php b/nextcloud_fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_production-fpm/config/autoconfig.php
rename to nextcloud_fpm/config/autoconfig.php
diff --git a/nextcloud_production-fpm/config/redis.config.php b/nextcloud_fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/redis.config.php
rename to nextcloud_fpm/config/redis.config.php
diff --git a/nextcloud_production-fpm/config/reverse-proxy.config.php b/nextcloud_fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/reverse-proxy.config.php
rename to nextcloud_fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_production-fpm/config/s3.config.php b/nextcloud_fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/s3.config.php
rename to nextcloud_fpm/config/s3.config.php
diff --git a/nextcloud_production-fpm/config/smtp.config.php b/nextcloud_fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/smtp.config.php
rename to nextcloud_fpm/config/smtp.config.php
diff --git a/nextcloud_production-fpm/config/swift.config.php b/nextcloud_fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_production-fpm/config/swift.config.php
rename to nextcloud_fpm/config/swift.config.php
diff --git a/nextcloud_production-fpm/cron.sh b/nextcloud_fpm/cron.sh
similarity index 100%
rename from nextcloud_production-fpm/cron.sh
rename to nextcloud_fpm/cron.sh
diff --git a/nextcloud_production-fpm/entrypoint.sh b/nextcloud_fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_production-fpm/entrypoint.sh
rename to nextcloud_fpm/entrypoint.sh
diff --git a/nextcloud_production-fpm/upgrade.exclude b/nextcloud_fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_production-fpm/upgrade.exclude
rename to nextcloud_fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_latest/Dockerfile
similarity index 99%
rename from nextcloud_production/Dockerfile
rename to nextcloud_latest/Dockerfile
index 2d67b59..149a832 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_latest/Dockerfile
@@ -122,7 +122,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 22.2.0
+ENV NEXTCLOUD_VERSION 22.2.1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production/config/apache-pretty-urls.config.php b/nextcloud_latest/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_production/config/apache-pretty-urls.config.php
rename to nextcloud_latest/config/apache-pretty-urls.config.php
diff --git a/nextcloud_production/config/apcu.config.php b/nextcloud_latest/config/apcu.config.php
similarity index 100%
rename from nextcloud_production/config/apcu.config.php
rename to nextcloud_latest/config/apcu.config.php
diff --git a/nextcloud_production/config/apps.config.php b/nextcloud_latest/config/apps.config.php
similarity index 100%
rename from nextcloud_production/config/apps.config.php
rename to nextcloud_latest/config/apps.config.php
diff --git a/nextcloud_production/config/autoconfig.php b/nextcloud_latest/config/autoconfig.php
similarity index 100%
rename from nextcloud_production/config/autoconfig.php
rename to nextcloud_latest/config/autoconfig.php
diff --git a/nextcloud_production/config/redis.config.php b/nextcloud_latest/config/redis.config.php
similarity index 100%
rename from nextcloud_production/config/redis.config.php
rename to nextcloud_latest/config/redis.config.php
diff --git a/nextcloud_production/config/reverse-proxy.config.php b/nextcloud_latest/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_production/config/reverse-proxy.config.php
rename to nextcloud_latest/config/reverse-proxy.config.php
diff --git a/nextcloud_production/config/s3.config.php b/nextcloud_latest/config/s3.config.php
similarity index 100%
rename from nextcloud_production/config/s3.config.php
rename to nextcloud_latest/config/s3.config.php
diff --git a/nextcloud_production/config/smtp.config.php b/nextcloud_latest/config/smtp.config.php
similarity index 100%
rename from nextcloud_production/config/smtp.config.php
rename to nextcloud_latest/config/smtp.config.php
diff --git a/nextcloud_production/config/swift.config.php b/nextcloud_latest/config/swift.config.php
similarity index 100%
rename from nextcloud_production/config/swift.config.php
rename to nextcloud_latest/config/swift.config.php
diff --git a/nextcloud_production/cron.sh b/nextcloud_latest/cron.sh
similarity index 100%
rename from nextcloud_production/cron.sh
rename to nextcloud_latest/cron.sh
diff --git a/nextcloud_production/entrypoint.sh b/nextcloud_latest/entrypoint.sh
similarity index 100%
rename from nextcloud_production/entrypoint.sh
rename to nextcloud_latest/entrypoint.sh
diff --git a/nextcloud_production/upgrade.exclude b/nextcloud_latest/upgrade.exclude
similarity index 100%
rename from nextcloud_production/upgrade.exclude
rename to nextcloud_latest/upgrade.exclude

Relevant Maintainers:

@tianon
Copy link
Member

tianon commented Nov 12, 2021

CI failures are our standard test flakiness.

@tianon tianon merged commit c4892ec into docker-library:master Nov 12, 2021
@J0WI J0WI deleted the nextcloud-22.2.1 branch November 13, 2021 21:33
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