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

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Update nextcloud #8810

merged 1 commit into from
Oct 1, 2020

Conversation

tilosp
Copy link
Contributor

@tilosp tilosp commented Sep 30, 2020

Manually for now since @tilosp-bot is retired.

Is it possible to use doi-janky only for generate-stackbrew-library.sh and not update.sh?
Since update.sh is now handled by GitHub Actions.

Signed-off-by: Tilo Spannagel <development@tilosp.de>
@github-actions
Copy link

Diff for 9da5fa5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index fedad6a..598b7c2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,47 +16,47 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 17.0/fpm-alpine
 
-Tags: 18.0.9-apache, 18.0-apache, 18-apache, production-apache, 18.0.9, 18.0, 18, production
+Tags: 18.0.9-apache, 18.0-apache, 18-apache, 18.0.9, 18.0, 18
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 18.0/apache
 
-Tags: 18.0.9-fpm, 18.0-fpm, 18-fpm, production-fpm
+Tags: 18.0.9-fpm, 18.0-fpm, 18-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 18.0/fpm
 
-Tags: 18.0.9-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine, production-fpm-alpine
+Tags: 18.0.9-fpm-alpine, 18.0-fpm-alpine, 18-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 18.0/fpm-alpine
 
-Tags: 19.0.3-apache, 19.0-apache, 19-apache, apache, stable-apache, 19.0.3, 19.0, 19, latest, stable
+Tags: 19.0.3-apache, 19.0-apache, 19-apache, apache, stable-apache, production-apache, 19.0.3, 19.0, 19, latest, stable, production
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 19.0/apache
 
-Tags: 19.0.3-fpm, 19.0-fpm, 19-fpm, fpm, stable-fpm
+Tags: 19.0.3-fpm, 19.0-fpm, 19-fpm, fpm, stable-fpm, production-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 19.0/fpm
 
-Tags: 19.0.3-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine, fpm-alpine, stable-fpm-alpine
+Tags: 19.0.3-fpm-alpine, 19.0-fpm-alpine, 19-fpm-alpine, fpm-alpine, stable-fpm-alpine, production-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
 Directory: 19.0/fpm-alpine
 
-Tags: 20.0.0RC1-apache, 20.0.0-rc-apache, 20.0-rc-apache, 20-rc-apache, 20.0.0RC1, 20.0.0-rc, 20.0-rc, 20-rc
+Tags: 20.0.0RC2-apache, 20.0.0-rc-apache, 20.0-rc-apache, 20-rc-apache, 20.0.0RC2, 20.0.0-rc, 20.0-rc, 20-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
+GitCommit: ae77b5ab9f8b85ecbaf3311b964919cfdafff02b
 Directory: 20.0-rc/apache
 
-Tags: 20.0.0RC1-fpm, 20.0.0-rc-fpm, 20.0-rc-fpm, 20-rc-fpm
+Tags: 20.0.0RC2-fpm, 20.0.0-rc-fpm, 20.0-rc-fpm, 20-rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
+GitCommit: ae77b5ab9f8b85ecbaf3311b964919cfdafff02b
 Directory: 20.0-rc/fpm
 
-Tags: 20.0.0RC1-fpm-alpine, 20.0.0-rc-fpm-alpine, 20.0-rc-fpm-alpine, 20-rc-fpm-alpine
+Tags: 20.0.0RC2-fpm-alpine, 20.0.0-rc-fpm-alpine, 20.0-rc-fpm-alpine, 20-rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f1b22e0ceebfec9cc03454809cf36ceb641b82b9
+GitCommit: ae77b5ab9f8b85ecbaf3311b964919cfdafff02b
 Directory: 20.0-rc/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 5cc0586..e29dc9b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -42,10 +42,10 @@ nextcloud:20.0-rc
 nextcloud:20.0-rc-apache
 nextcloud:20.0-rc-fpm
 nextcloud:20.0-rc-fpm-alpine
-nextcloud:20.0.0RC1
-nextcloud:20.0.0RC1-apache
-nextcloud:20.0.0RC1-fpm
-nextcloud:20.0.0RC1-fpm-alpine
+nextcloud:20.0.0RC2
+nextcloud:20.0.0RC2-apache
+nextcloud:20.0.0RC2-fpm
+nextcloud:20.0.0RC2-fpm-alpine
 nextcloud:20.0.0-rc
 nextcloud:20.0.0-rc-apache
 nextcloud:20.0.0-rc-fpm
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_18-fpm-alpine/Dockerfile
similarity index 100%
copy from nextcloud_production-fpm-alpine/Dockerfile
copy to nextcloud_18-fpm-alpine/Dockerfile
diff --git a/nextcloud_stable-fpm-alpine/config/apcu.config.php b/nextcloud_18-fpm-alpine/config/apcu.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/apcu.config.php
rename to nextcloud_18-fpm-alpine/config/apcu.config.php
diff --git a/nextcloud_stable-fpm-alpine/config/apps.config.php b/nextcloud_18-fpm-alpine/config/apps.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/apps.config.php
rename to nextcloud_18-fpm-alpine/config/apps.config.php
diff --git a/nextcloud_stable-fpm-alpine/config/autoconfig.php b/nextcloud_18-fpm-alpine/config/autoconfig.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/autoconfig.php
rename to nextcloud_18-fpm-alpine/config/autoconfig.php
diff --git a/nextcloud_stable-fpm-alpine/config/redis.config.php b/nextcloud_18-fpm-alpine/config/redis.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/redis.config.php
rename to nextcloud_18-fpm-alpine/config/redis.config.php
diff --git a/nextcloud_stable-fpm-alpine/config/reverse-proxy.config.php b/nextcloud_18-fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/reverse-proxy.config.php
rename to nextcloud_18-fpm-alpine/config/reverse-proxy.config.php
diff --git a/nextcloud_stable-fpm-alpine/config/s3.config.php b/nextcloud_18-fpm-alpine/config/s3.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/s3.config.php
rename to nextcloud_18-fpm-alpine/config/s3.config.php
diff --git a/nextcloud_stable-fpm-alpine/config/smtp.config.php b/nextcloud_18-fpm-alpine/config/smtp.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/smtp.config.php
rename to nextcloud_18-fpm-alpine/config/smtp.config.php
diff --git a/nextcloud_stable-fpm-alpine/config/swift.config.php b/nextcloud_18-fpm-alpine/config/swift.config.php
similarity index 100%
rename from nextcloud_stable-fpm-alpine/config/swift.config.php
rename to nextcloud_18-fpm-alpine/config/swift.config.php
diff --git a/nextcloud_stable-fpm-alpine/cron.sh b/nextcloud_18-fpm-alpine/cron.sh
similarity index 100%
rename from nextcloud_stable-fpm-alpine/cron.sh
rename to nextcloud_18-fpm-alpine/cron.sh
diff --git a/nextcloud_stable-fpm-alpine/entrypoint.sh b/nextcloud_18-fpm-alpine/entrypoint.sh
similarity index 100%
rename from nextcloud_stable-fpm-alpine/entrypoint.sh
rename to nextcloud_18-fpm-alpine/entrypoint.sh
diff --git a/nextcloud_stable-fpm-alpine/upgrade.exclude b/nextcloud_18-fpm-alpine/upgrade.exclude
similarity index 100%
rename from nextcloud_stable-fpm-alpine/upgrade.exclude
rename to nextcloud_18-fpm-alpine/upgrade.exclude
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_18-fpm/Dockerfile
similarity index 100%
copy from nextcloud_production-fpm/Dockerfile
copy to nextcloud_18-fpm/Dockerfile
diff --git a/nextcloud_stable-fpm/config/apcu.config.php b/nextcloud_18-fpm/config/apcu.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/apcu.config.php
rename to nextcloud_18-fpm/config/apcu.config.php
diff --git a/nextcloud_stable-fpm/config/apps.config.php b/nextcloud_18-fpm/config/apps.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/apps.config.php
rename to nextcloud_18-fpm/config/apps.config.php
diff --git a/nextcloud_stable-fpm/config/autoconfig.php b/nextcloud_18-fpm/config/autoconfig.php
similarity index 100%
rename from nextcloud_stable-fpm/config/autoconfig.php
rename to nextcloud_18-fpm/config/autoconfig.php
diff --git a/nextcloud_stable-fpm/config/redis.config.php b/nextcloud_18-fpm/config/redis.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/redis.config.php
rename to nextcloud_18-fpm/config/redis.config.php
diff --git a/nextcloud_stable-fpm/config/reverse-proxy.config.php b/nextcloud_18-fpm/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/reverse-proxy.config.php
rename to nextcloud_18-fpm/config/reverse-proxy.config.php
diff --git a/nextcloud_stable-fpm/config/s3.config.php b/nextcloud_18-fpm/config/s3.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/s3.config.php
rename to nextcloud_18-fpm/config/s3.config.php
diff --git a/nextcloud_stable-fpm/config/smtp.config.php b/nextcloud_18-fpm/config/smtp.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/smtp.config.php
rename to nextcloud_18-fpm/config/smtp.config.php
diff --git a/nextcloud_stable-fpm/config/swift.config.php b/nextcloud_18-fpm/config/swift.config.php
similarity index 100%
rename from nextcloud_stable-fpm/config/swift.config.php
rename to nextcloud_18-fpm/config/swift.config.php
diff --git a/nextcloud_stable-fpm/cron.sh b/nextcloud_18-fpm/cron.sh
similarity index 100%
rename from nextcloud_stable-fpm/cron.sh
rename to nextcloud_18-fpm/cron.sh
diff --git a/nextcloud_stable-fpm/entrypoint.sh b/nextcloud_18-fpm/entrypoint.sh
similarity index 100%
rename from nextcloud_stable-fpm/entrypoint.sh
rename to nextcloud_18-fpm/entrypoint.sh
diff --git a/nextcloud_stable-fpm/upgrade.exclude b/nextcloud_18-fpm/upgrade.exclude
similarity index 100%
rename from nextcloud_stable-fpm/upgrade.exclude
rename to nextcloud_18-fpm/upgrade.exclude
diff --git a/nextcloud_production/Dockerfile b/nextcloud_18/Dockerfile
similarity index 100%
copy from nextcloud_production/Dockerfile
copy to nextcloud_18/Dockerfile
diff --git a/nextcloud_stable/config/apache-pretty-urls.config.php b/nextcloud_18/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_stable/config/apache-pretty-urls.config.php
rename to nextcloud_18/config/apache-pretty-urls.config.php
diff --git a/nextcloud_stable/config/apcu.config.php b/nextcloud_18/config/apcu.config.php
similarity index 100%
rename from nextcloud_stable/config/apcu.config.php
rename to nextcloud_18/config/apcu.config.php
diff --git a/nextcloud_stable/config/apps.config.php b/nextcloud_18/config/apps.config.php
similarity index 100%
rename from nextcloud_stable/config/apps.config.php
rename to nextcloud_18/config/apps.config.php
diff --git a/nextcloud_stable/config/autoconfig.php b/nextcloud_18/config/autoconfig.php
similarity index 100%
rename from nextcloud_stable/config/autoconfig.php
rename to nextcloud_18/config/autoconfig.php
diff --git a/nextcloud_stable/config/redis.config.php b/nextcloud_18/config/redis.config.php
similarity index 100%
rename from nextcloud_stable/config/redis.config.php
rename to nextcloud_18/config/redis.config.php
diff --git a/nextcloud_stable/config/reverse-proxy.config.php b/nextcloud_18/config/reverse-proxy.config.php
similarity index 100%
rename from nextcloud_stable/config/reverse-proxy.config.php
rename to nextcloud_18/config/reverse-proxy.config.php
diff --git a/nextcloud_stable/config/s3.config.php b/nextcloud_18/config/s3.config.php
similarity index 100%
rename from nextcloud_stable/config/s3.config.php
rename to nextcloud_18/config/s3.config.php
diff --git a/nextcloud_stable/config/smtp.config.php b/nextcloud_18/config/smtp.config.php
similarity index 100%
rename from nextcloud_stable/config/smtp.config.php
rename to nextcloud_18/config/smtp.config.php
diff --git a/nextcloud_stable/config/swift.config.php b/nextcloud_18/config/swift.config.php
similarity index 100%
rename from nextcloud_stable/config/swift.config.php
rename to nextcloud_18/config/swift.config.php
diff --git a/nextcloud_stable/cron.sh b/nextcloud_18/cron.sh
similarity index 100%
rename from nextcloud_stable/cron.sh
rename to nextcloud_18/cron.sh
diff --git a/nextcloud_stable/entrypoint.sh b/nextcloud_18/entrypoint.sh
similarity index 100%
rename from nextcloud_stable/entrypoint.sh
rename to nextcloud_18/entrypoint.sh
diff --git a/nextcloud_stable/upgrade.exclude b/nextcloud_18/upgrade.exclude
similarity index 100%
rename from nextcloud_stable/upgrade.exclude
rename to nextcloud_18/upgrade.exclude
diff --git a/nextcloud_20-rc-fpm-alpine/Dockerfile b/nextcloud_20-rc-fpm-alpine/Dockerfile
index a558fb2..f1acde5 100644
--- a/nextcloud_20-rc-fpm-alpine/Dockerfile
+++ b/nextcloud_20-rc-fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.0RC1
+ENV NEXTCLOUD_VERSION 20.0.0RC2
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_20-rc-fpm/Dockerfile b/nextcloud_20-rc-fpm/Dockerfile
index bad34e1..925f5ca 100644
--- a/nextcloud_20-rc-fpm/Dockerfile
+++ b/nextcloud_20-rc-fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.0RC1
+ENV NEXTCLOUD_VERSION 20.0.0RC2
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_20-rc/Dockerfile b/nextcloud_20-rc/Dockerfile
index 661a86a..9590fe0 100644
--- a/nextcloud_20-rc/Dockerfile
+++ b/nextcloud_20-rc/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 20.0.0RC1
+ENV NEXTCLOUD_VERSION 20.0.0RC2
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 0eb9e0c..55a0b20 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.12
+FROM php:7.4-fpm-alpine3.12
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -35,9 +35,10 @@ RUN set -ex; \
         gmp-dev \
     ; \
     \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-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 \
         gd \
         intl \
@@ -53,7 +54,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.18; \
     pecl install memcached-3.1.5; \
-    pecl install redis-4.3.0; \
+    pecl install redis-5.3.1; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -94,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 18.0.9
+ENV NEXTCLOUD_VERSION 19.0.3
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 97f7b5f..66027f1 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
+FROM php:7.4-fpm-buster
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -41,11 +41,10 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
+    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 \
         gd \
         intl \
@@ -61,7 +60,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.18; \
     pecl install memcached-3.1.5; \
-    pecl install redis-4.3.0; \
+    pecl install redis-5.3.1; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -107,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 18.0.9
+ENV NEXTCLOUD_VERSION 19.0.3
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index 5ad3f52..c77835a 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
+FROM php:7.4-apache-buster
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -41,11 +41,10 @@ RUN set -ex; \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
-    docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
+    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 \
         gd \
         intl \
@@ -61,7 +60,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.18; \
     pecl install memcached-3.1.5; \
-    pecl install redis-4.3.0; \
+    pecl install redis-5.3.1; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -115,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 18.0.9
+ENV NEXTCLOUD_VERSION 19.0.3
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_stable-fpm-alpine/Dockerfile b/nextcloud_stable-fpm-alpine/Dockerfile
deleted file mode 100644
index 55a0b20..0000000
diff --git a/nextcloud_stable-fpm/Dockerfile b/nextcloud_stable-fpm/Dockerfile
deleted file mode 100644
index 66027f1..0000000
diff --git a/nextcloud_stable/Dockerfile b/nextcloud_stable/Dockerfile
deleted file mode 100644
index c77835a..0000000

@tianon
Copy link
Member

tianon commented Sep 30, 2020

Is it possible to use doi-janky only for generate-stackbrew-library.sh and not update.sh?

Yes! I've done a quick test with this of doing exactly that via docker-library/oi-janky-groovy@35f8f5c, and you can see the result via master...docker-library-bot:nextcloud (looks like we have the same odd entry reordering we see with J0WI's PRs 😕).

@tilosp
Copy link
Contributor Author

tilosp commented Oct 1, 2020

Yes! I've done a quick test with this of doing exactly that via docker-library/oi-janky-groovy@35f8f5c, and you can see the result via master...docker-library-bot:nextcloud (looks like we have the same odd entry reordering we see with J0WI's PRs confused).

Great, this saves me the work of figuring out how to do this with github actions.

Feel free to close this pr and use the docker-library-bot:nextcloud branch to get the reordering done right away.

@tianon
Copy link
Member

tianon commented Oct 1, 2020

I did some testing locally, and found that if I set LANG=C, I end up getting a result similar to what you're getting, so it's probably worth adding something like export LANG=C early in your script to just force that deterministic locale setting for more deterministic ordering.

Also, I think we should probably have @docker-library-bot commit to a fork of https://github.com/docker-library/official-images that you can actually open a PR from (unless you want to monitor/copy https://github.com/docker-library-bot/official-images/tree/nextcloud anytime the bot pushes to it with something like https://github.com/docker-library-bot/official-images/commits/nextcloud.atom).

@yosifkit
Copy link
Member

yosifkit commented Oct 1, 2020

LGTM, Just the regular test failures:

testing nextcloud:19.0.3-apache
	'nextcloud-cli-postgres' [6/8]...failed

@yosifkit yosifkit merged commit 0dce31b into docker-library:master Oct 1, 2020
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