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 image #8433

Merged
merged 3 commits into from
Jul 28, 2020
Merged

Update nextcloud image #8433

merged 3 commits into from
Jul 28, 2020

Conversation

tilosp-bot
Copy link
Contributor

@yosifkit
Copy link
Member

On hold: nextcloud/docker#1181 (comment)

@tilosp
Copy link
Contributor

tilosp commented Jul 28, 2020

On hold: nextcloud/docker#1181 (comment)

should be solved now

@github-actions
Copy link

Diff for ba4bad7:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cb96997..091aa0c 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: 17.0.8-apache, 17.0-apache, 17-apache, 17.0.8, 17.0, 17
+Tags: 17.0.8-apache, 17.0-apache, 17-apache, production-apache, 17.0.8, 17.0, 17, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 17.0/apache
 
-Tags: 17.0.8-fpm, 17.0-fpm, 17-fpm
+Tags: 17.0.8-fpm, 17.0-fpm, 17-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 17.0/fpm
 
-Tags: 17.0.8-fpm-alpine, 17.0-fpm-alpine, 17-fpm-alpine
+Tags: 17.0.8-fpm-alpine, 17.0-fpm-alpine, 17-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 17.0/fpm-alpine
 
-Tags: 18.0.7-apache, 18.0-apache, 18-apache, 18.0.7, 18.0, 18
+Tags: 18.0.7-apache, 18.0-apache, 18-apache, stable-apache, 18.0.7, 18.0, 18, stable
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 18.0/apache
 
-Tags: 18.0.7-fpm, 18.0-fpm, 18-fpm
+Tags: 18.0.7-fpm, 18.0-fpm, 18-fpm, stable-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 18.0/fpm
 
-Tags: 18.0.7-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine
+Tags: 18.0.7-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine, stable-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 18.0/fpm-alpine
 
 Tags: 19.0.1-apache, 19.0-apache, 19-apache, apache, 19.0.1, 19.0, 19, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 19.0/apache
 
 Tags: 19.0.1-fpm, 19.0-fpm, 19-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 19.0/fpm
 
 Tags: 19.0.1-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 45f3995ab7c46fff7d7e779a00b69443f9a90fa6
+GitCommit: 1e6d0620af955df9430046570ed23817f381dba5
 Directory: 19.0/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 0515e1d..aa0534b 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/nextcloud_17-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
similarity index 100%
rename from nextcloud_17-fpm-alpine/Dockerfile
rename to nextcloud_production-fpm-alpine/Dockerfile
diff --git a/nextcloud_17-fpm-alpine/config/apcu.config.php b/nextcloud_production-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_17-fpm-alpine/config/apcu.config.php
rename to nextcloud_production-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_17-fpm-alpine/config/apps.config.php b/nextcloud_production-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_17-fpm-alpine/config/apps.config.php
rename to nextcloud_production-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_17-fpm-alpine/config/autoconfig.php b/nextcloud_production-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_17-fpm-alpine/config/autoconfig.php
rename to nextcloud_production-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_17-fpm-alpine/config/redis.config.php b/nextcloud_production-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_17-fpm-alpine/config/redis.config.php
rename to nextcloud_production-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_17-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_17-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_production-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm-alpine/config/smtp.config.php b/nextcloud_production-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_17-fpm-alpine/config/smtp.config.php
rename to nextcloud_production-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_17-fpm-alpine/cron.sh b/nextcloud_production-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_17-fpm-alpine/cron.sh
rename to nextcloud_production-fpm-alpine/cron.sh
diff --git a/nextcloud_17-fpm-alpine/entrypoint.sh b/nextcloud_production-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_17-fpm-alpine/entrypoint.sh
rename to nextcloud_production-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_17-fpm-alpine/upgrade.exclude b/nextcloud_production-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_17-fpm-alpine/upgrade.exclude
rename to nextcloud_production-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_17-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
similarity index 100%
rename from nextcloud_17-fpm/Dockerfile
rename to nextcloud_production-fpm/Dockerfile
diff --git a/nextcloud_17-fpm/config/apcu.config.php b/nextcloud_production-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_17-fpm/config/apcu.config.php
rename to nextcloud_production-fpm/config/apcu.config.php
diff --git a/nextcloud_17-fpm/config/apps.config.php b/nextcloud_production-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_17-fpm/config/apps.config.php
rename to nextcloud_production-fpm/config/apps.config.php
diff --git a/nextcloud_17-fpm/config/autoconfig.php b/nextcloud_production-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_17-fpm/config/autoconfig.php
rename to nextcloud_production-fpm/config/autoconfig.php
diff --git a/nextcloud_17-fpm/config/redis.config.php b/nextcloud_production-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_17-fpm/config/redis.config.php
rename to nextcloud_production-fpm/config/redis.config.php
diff --git a/nextcloud_17-fpm/config/reverse-proxy.config.php b/nextcloud_production-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_17-fpm/config/reverse-proxy.config.php
rename to nextcloud_production-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_17-fpm/config/smtp.config.php b/nextcloud_production-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_17-fpm/config/smtp.config.php
rename to nextcloud_production-fpm/config/smtp.config.php
diff --git a/nextcloud_17-fpm/cron.sh b/nextcloud_production-fpm/cron.sh
similarity index 100%
rename from nextcloud_17-fpm/cron.sh
rename to nextcloud_production-fpm/cron.sh
diff --git a/nextcloud_17-fpm/entrypoint.sh b/nextcloud_production-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_17-fpm/entrypoint.sh
rename to nextcloud_production-fpm/entrypoint.sh
diff --git a/nextcloud_17-fpm/upgrade.exclude b/nextcloud_production-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_17-fpm/upgrade.exclude
rename to nextcloud_production-fpm/upgrade.exclude
diff --git a/nextcloud_17/Dockerfile b/nextcloud_production/Dockerfile
similarity index 100%
rename from nextcloud_17/Dockerfile
rename to nextcloud_production/Dockerfile
diff --git a/nextcloud_17/config/apache-pretty-urls.config.php b/nextcloud_production/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_17/config/apache-pretty-urls.config.php
rename to nextcloud_production/config/apache-pretty-urls.config.php
diff --git a/nextcloud_17/config/apcu.config.php b/nextcloud_production/config/apcu.config.php
similarity index 100%
rename from nextcloud_17/config/apcu.config.php
rename to nextcloud_production/config/apcu.config.php
diff --git a/nextcloud_17/config/apps.config.php b/nextcloud_production/config/apps.config.php
similarity index 100%
rename from nextcloud_17/config/apps.config.php
rename to nextcloud_production/config/apps.config.php
diff --git a/nextcloud_17/config/autoconfig.php b/nextcloud_production/config/autoconfig.php
similarity index 100%
rename from nextcloud_17/config/autoconfig.php
rename to nextcloud_production/config/autoconfig.php
diff --git a/nextcloud_17/config/redis.config.php b/nextcloud_production/config/redis.config.php
similarity index 100%
rename from nextcloud_17/config/redis.config.php
rename to nextcloud_production/config/redis.config.php
diff --git a/nextcloud_17/config/reverse-proxy.config.php b/nextcloud_production/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_17/config/reverse-proxy.config.php
rename to nextcloud_production/config/reverse-proxy.config.php
diff --git a/nextcloud_17/config/smtp.config.php b/nextcloud_production/config/smtp.config.php
similarity index 100%
rename from nextcloud_17/config/smtp.config.php
rename to nextcloud_production/config/smtp.config.php
diff --git a/nextcloud_17/cron.sh b/nextcloud_production/cron.sh
similarity index 100%
rename from nextcloud_17/cron.sh
rename to nextcloud_production/cron.sh
diff --git a/nextcloud_17/entrypoint.sh b/nextcloud_production/entrypoint.sh
similarity index 100%
rename from nextcloud_17/entrypoint.sh
rename to nextcloud_production/entrypoint.sh
diff --git a/nextcloud_17/upgrade.exclude b/nextcloud_production/upgrade.exclude
similarity index 100%
rename from nextcloud_17/upgrade.exclude
rename to nextcloud_production/upgrade.exclude
diff --git a/nextcloud_18-fpm-alpine/Dockerfile b/nextcloud_stable-fpm-alpine/Dockerfile
similarity index 100%
rename from nextcloud_18-fpm-alpine/Dockerfile
rename to nextcloud_stable-fpm-alpine/Dockerfile
diff --git a/nextcloud_18-fpm-alpine/config/apcu.config.php b/nextcloud_stable-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_18-fpm-alpine/config/apcu.config.php
rename to nextcloud_stable-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_18-fpm-alpine/config/apps.config.php b/nextcloud_stable-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_18-fpm-alpine/config/apps.config.php
rename to nextcloud_stable-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_18-fpm-alpine/config/autoconfig.php b/nextcloud_stable-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_18-fpm-alpine/config/autoconfig.php
rename to nextcloud_stable-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_18-fpm-alpine/config/redis.config.php b/nextcloud_stable-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_18-fpm-alpine/config/redis.config.php
rename to nextcloud_stable-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_18-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_stable-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_18-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_stable-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_18-fpm-alpine/config/smtp.config.php b/nextcloud_stable-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_18-fpm-alpine/config/smtp.config.php
rename to nextcloud_stable-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_18-fpm-alpine/cron.sh b/nextcloud_stable-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_18-fpm-alpine/cron.sh
rename to nextcloud_stable-fpm-alpine/cron.sh
diff --git a/nextcloud_18-fpm-alpine/entrypoint.sh b/nextcloud_stable-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_18-fpm-alpine/entrypoint.sh
rename to nextcloud_stable-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_18-fpm-alpine/upgrade.exclude b/nextcloud_stable-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_18-fpm-alpine/upgrade.exclude
rename to nextcloud_stable-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_18-fpm/Dockerfile b/nextcloud_stable-fpm/Dockerfile
similarity index 100%
rename from nextcloud_18-fpm/Dockerfile
rename to nextcloud_stable-fpm/Dockerfile
diff --git a/nextcloud_18-fpm/config/apcu.config.php b/nextcloud_stable-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_18-fpm/config/apcu.config.php
rename to nextcloud_stable-fpm/config/apcu.config.php
diff --git a/nextcloud_18-fpm/config/apps.config.php b/nextcloud_stable-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_18-fpm/config/apps.config.php
rename to nextcloud_stable-fpm/config/apps.config.php
diff --git a/nextcloud_18-fpm/config/autoconfig.php b/nextcloud_stable-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_18-fpm/config/autoconfig.php
rename to nextcloud_stable-fpm/config/autoconfig.php
diff --git a/nextcloud_18-fpm/config/redis.config.php b/nextcloud_stable-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_18-fpm/config/redis.config.php
rename to nextcloud_stable-fpm/config/redis.config.php
diff --git a/nextcloud_18-fpm/config/reverse-proxy.config.php b/nextcloud_stable-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_18-fpm/config/reverse-proxy.config.php
rename to nextcloud_stable-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_18-fpm/config/smtp.config.php b/nextcloud_stable-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_18-fpm/config/smtp.config.php
rename to nextcloud_stable-fpm/config/smtp.config.php
diff --git a/nextcloud_18-fpm/cron.sh b/nextcloud_stable-fpm/cron.sh
similarity index 100%
rename from nextcloud_18-fpm/cron.sh
rename to nextcloud_stable-fpm/cron.sh
diff --git a/nextcloud_18-fpm/entrypoint.sh b/nextcloud_stable-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_18-fpm/entrypoint.sh
rename to nextcloud_stable-fpm/entrypoint.sh
diff --git a/nextcloud_18-fpm/upgrade.exclude b/nextcloud_stable-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_18-fpm/upgrade.exclude
rename to nextcloud_stable-fpm/upgrade.exclude
diff --git a/nextcloud_18/Dockerfile b/nextcloud_stable/Dockerfile
similarity index 100%
rename from nextcloud_18/Dockerfile
rename to nextcloud_stable/Dockerfile
diff --git a/nextcloud_18/config/apache-pretty-urls.config.php b/nextcloud_stable/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_18/config/apache-pretty-urls.config.php
rename to nextcloud_stable/config/apache-pretty-urls.config.php
diff --git a/nextcloud_18/config/apcu.config.php b/nextcloud_stable/config/apcu.config.php
similarity index 100%
rename from nextcloud_18/config/apcu.config.php
rename to nextcloud_stable/config/apcu.config.php
diff --git a/nextcloud_18/config/apps.config.php b/nextcloud_stable/config/apps.config.php
similarity index 100%
rename from nextcloud_18/config/apps.config.php
rename to nextcloud_stable/config/apps.config.php
diff --git a/nextcloud_18/config/autoconfig.php b/nextcloud_stable/config/autoconfig.php
similarity index 100%
rename from nextcloud_18/config/autoconfig.php
rename to nextcloud_stable/config/autoconfig.php
diff --git a/nextcloud_18/config/redis.config.php b/nextcloud_stable/config/redis.config.php
similarity index 100%
rename from nextcloud_18/config/redis.config.php
rename to nextcloud_stable/config/redis.config.php
diff --git a/nextcloud_18/config/reverse-proxy.config.php b/nextcloud_stable/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_18/config/reverse-proxy.config.php
rename to nextcloud_stable/config/reverse-proxy.config.php
diff --git a/nextcloud_18/config/smtp.config.php b/nextcloud_stable/config/smtp.config.php
similarity index 100%
rename from nextcloud_18/config/smtp.config.php
rename to nextcloud_stable/config/smtp.config.php
diff --git a/nextcloud_18/cron.sh b/nextcloud_stable/cron.sh
similarity index 100%
rename from nextcloud_18/cron.sh
rename to nextcloud_stable/cron.sh
diff --git a/nextcloud_18/entrypoint.sh b/nextcloud_stable/entrypoint.sh
similarity index 100%
rename from nextcloud_18/entrypoint.sh
rename to nextcloud_stable/entrypoint.sh
diff --git a/nextcloud_18/upgrade.exclude b/nextcloud_stable/upgrade.exclude
similarity index 100%
rename from nextcloud_18/upgrade.exclude
rename to nextcloud_stable/upgrade.exclude

@yosifkit yosifkit merged commit eb1d4ef into docker-library:master Jul 28, 2020
@tilosp-bot tilosp-bot deleted the bot/nextcloud branch July 28, 2020 20:03
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