Update nextcloud image #5413
Merged
Update nextcloud image #5413
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nextcloud/docker@ba4c135 nextcloud/docker@f2ee88d nextcloud/docker@536fb66 nextcloud/docker@d1db681 nextcloud/docker@a9f458c nextcloud/docker@2e481a8 nextcloud/docker@b3b6def nextcloud/docker@d3cd3b8 nextcloud/docker@e0de4ab nextcloud/docker@da1192e nextcloud/docker@cd72548 nextcloud/docker@6b8820f nextcloud/docker@2695fd9 nextcloud/docker@6d7be41 nextcloud/docker@b9ae325
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 7f74e7a..de7a30b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -15,40 +15,6 @@ nextcloud:13-fpm-alpine @ arm32v6
nextcloud:13-fpm-alpine @ arm64v8
nextcloud:13-fpm-alpine @ i386
nextcloud:13-fpm-alpine @ ppc64le
-nextcloud:13-rc @ amd64
-nextcloud:13-rc @ arm32v5
-nextcloud:13-rc @ arm32v7
-nextcloud:13-rc @ arm64v8
-nextcloud:13-rc @ i386
-nextcloud:13-rc @ ppc64le
-nextcloud:13-rc-fpm @ amd64
-nextcloud:13-rc-fpm @ arm32v5
-nextcloud:13-rc-fpm @ arm32v7
-nextcloud:13-rc-fpm @ arm64v8
-nextcloud:13-rc-fpm @ i386
-nextcloud:13-rc-fpm @ ppc64le
-nextcloud:13-rc-fpm-alpine @ amd64
-nextcloud:13-rc-fpm-alpine @ arm32v6
-nextcloud:13-rc-fpm-alpine @ arm64v8
-nextcloud:13-rc-fpm-alpine @ i386
-nextcloud:13-rc-fpm-alpine @ ppc64le
-nextcloud:14-rc @ amd64
-nextcloud:14-rc @ arm32v5
-nextcloud:14-rc @ arm32v7
-nextcloud:14-rc @ arm64v8
-nextcloud:14-rc @ i386
-nextcloud:14-rc @ ppc64le
-nextcloud:14-rc-fpm @ amd64
-nextcloud:14-rc-fpm @ arm32v5
-nextcloud:14-rc-fpm @ arm32v7
-nextcloud:14-rc-fpm @ arm64v8
-nextcloud:14-rc-fpm @ i386
-nextcloud:14-rc-fpm @ ppc64le
-nextcloud:14-rc-fpm-alpine @ amd64
-nextcloud:14-rc-fpm-alpine @ arm32v6
-nextcloud:14-rc-fpm-alpine @ arm64v8
-nextcloud:14-rc-fpm-alpine @ i386
-nextcloud:14-rc-fpm-alpine @ ppc64le
nextcloud:production @ amd64
nextcloud:production @ arm32v5
nextcloud:production @ arm32v7
@@ -66,23 +32,6 @@ nextcloud:production-fpm-alpine @ arm32v6
nextcloud:production-fpm-alpine @ arm64v8
nextcloud:production-fpm-alpine @ i386
nextcloud:production-fpm-alpine @ ppc64le
-nextcloud:rc @ amd64
-nextcloud:rc @ arm32v5
-nextcloud:rc @ arm32v7
-nextcloud:rc @ arm64v8
-nextcloud:rc @ i386
-nextcloud:rc @ ppc64le
-nextcloud:rc-fpm @ amd64
-nextcloud:rc-fpm @ arm32v5
-nextcloud:rc-fpm @ arm32v7
-nextcloud:rc-fpm @ arm64v8
-nextcloud:rc-fpm @ i386
-nextcloud:rc-fpm @ ppc64le
-nextcloud:rc-fpm-alpine @ amd64
-nextcloud:rc-fpm-alpine @ arm32v6
-nextcloud:rc-fpm-alpine @ arm64v8
-nextcloud:rc-fpm-alpine @ i386
-nextcloud:rc-fpm-alpine @ ppc64le
nextcloud:stable @ amd64
nextcloud:stable @ arm32v5
nextcloud:stable @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 5634457..38271f8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,86 +2,38 @@ nextcloud:13
nextcloud:13-apache
nextcloud:13-fpm
nextcloud:13-fpm-alpine
-nextcloud:13-rc
-nextcloud:13-rc-apache
-nextcloud:13-rc-fpm
-nextcloud:13-rc-fpm-alpine
nextcloud:13.0
nextcloud:13.0-apache
nextcloud:13.0-fpm
nextcloud:13.0-fpm-alpine
-nextcloud:13.0-rc
-nextcloud:13.0-rc-apache
-nextcloud:13.0-rc-fpm
-nextcloud:13.0-rc-fpm-alpine
-nextcloud:13.0.10
-nextcloud:13.0.10-apache
-nextcloud:13.0.10-fpm
-nextcloud:13.0.10-fpm-alpine
-nextcloud:13.0.11RC1
-nextcloud:13.0.11RC1-apache
-nextcloud:13.0.11RC1-fpm
-nextcloud:13.0.11RC1-fpm-alpine
-nextcloud:13.0.11-rc
-nextcloud:13.0.11-rc-apache
-nextcloud:13.0.11-rc-fpm
-nextcloud:13.0.11-rc-fpm-alpine
+nextcloud:13.0.11
+nextcloud:13.0.11-apache
+nextcloud:13.0.11-fpm
+nextcloud:13.0.11-fpm-alpine
nextcloud:14
nextcloud:14-apache
nextcloud:14-fpm
nextcloud:14-fpm-alpine
-nextcloud:14-rc
-nextcloud:14-rc-apache
-nextcloud:14-rc-fpm
-nextcloud:14-rc-fpm-alpine
nextcloud:14.0
nextcloud:14.0-apache
nextcloud:14.0-fpm
nextcloud:14.0-fpm-alpine
-nextcloud:14.0-rc
-nextcloud:14.0-rc-apache
-nextcloud:14.0-rc-fpm
-nextcloud:14.0-rc-fpm-alpine
-nextcloud:14.0.6
-nextcloud:14.0.6-apache
-nextcloud:14.0.6-fpm
-nextcloud:14.0.6-fpm-alpine
-nextcloud:14.0.7RC1
-nextcloud:14.0.7RC1-apache
-nextcloud:14.0.7RC1-fpm
-nextcloud:14.0.7RC1-fpm-alpine
-nextcloud:14.0.7-rc
-nextcloud:14.0.7-rc-apache
-nextcloud:14.0.7-rc-fpm
-nextcloud:14.0.7-rc-fpm-alpine
+nextcloud:14.0.7
+nextcloud:14.0.7-apache
+nextcloud:14.0.7-fpm
+nextcloud:14.0.7-fpm-alpine
nextcloud:15
nextcloud:15-apache
nextcloud:15-fpm
nextcloud:15-fpm-alpine
-nextcloud:15-rc
-nextcloud:15-rc-apache
-nextcloud:15-rc-fpm
-nextcloud:15-rc-fpm-alpine
nextcloud:15.0
nextcloud:15.0-apache
nextcloud:15.0-fpm
nextcloud:15.0-fpm-alpine
-nextcloud:15.0-rc
-nextcloud:15.0-rc-apache
-nextcloud:15.0-rc-fpm
-nextcloud:15.0-rc-fpm-alpine
-nextcloud:15.0.2
-nextcloud:15.0.2-apache
-nextcloud:15.0.2-fpm
-nextcloud:15.0.2-fpm-alpine
-nextcloud:15.0.3RC1
-nextcloud:15.0.3RC1-apache
-nextcloud:15.0.3RC1-fpm
-nextcloud:15.0.3RC1-fpm-alpine
-nextcloud:15.0.3-rc
-nextcloud:15.0.3-rc-apache
-nextcloud:15.0.3-rc-fpm
-nextcloud:15.0.3-rc-fpm-alpine
+nextcloud:15.0.4
+nextcloud:15.0.4-apache
+nextcloud:15.0.4-fpm
+nextcloud:15.0.4-fpm-alpine
nextcloud:apache
nextcloud:fpm
nextcloud:fpm-alpine
@@ -90,10 +42,6 @@ nextcloud:production
nextcloud:production-apache
nextcloud:production-fpm
nextcloud:production-fpm-alpine
-nextcloud:rc
-nextcloud:rc-apache
-nextcloud:rc-fpm
-nextcloud:rc-fpm-alpine
nextcloud:stable
nextcloud:stable-apache
nextcloud:stable-fpm
diff --git a/nextcloud_13-fpm-alpine/Dockerfile b/nextcloud_13-fpm-alpine/Dockerfile
index 98bc406..b546bf7 100644
--- a/nextcloud_13-fpm-alpine/Dockerfile
+++ b/nextcloud_13-fpm-alpine/Dockerfile
@@ -91,7 +91,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 13.0.10
+ENV NEXTCLOUD_VERSION 13.0.11
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_13-fpm-alpine/config/redis.config.php b/nextcloud_13-fpm-alpine/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_13-fpm-alpine/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_13-fpm/Dockerfile b/nextcloud_13-fpm/Dockerfile
index 22f343d..4200fcd 100644
--- a/nextcloud_13-fpm/Dockerfile
+++ b/nextcloud_13-fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 13.0.10
+ENV NEXTCLOUD_VERSION 13.0.11
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_13-fpm/config/redis.config.php b/nextcloud_13-fpm/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_13-fpm/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_13-rc-fpm-alpine/Dockerfile b/nextcloud_13-rc-fpm-alpine/Dockerfile
deleted file mode 100644
index e604e32..0000000
diff --git a/nextcloud_13-rc-fpm-alpine/config/apcu.config.php b/nextcloud_13-rc-fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_13-rc-fpm-alpine/config/apps.config.php b/nextcloud_13-rc-fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_13-rc-fpm-alpine/config/autoconfig.php b/nextcloud_13-rc-fpm-alpine/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_13-rc-fpm-alpine/cron.sh b/nextcloud_13-rc-fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_13-rc-fpm-alpine/entrypoint.sh b/nextcloud_13-rc-fpm-alpine/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_13-rc-fpm-alpine/upgrade.exclude b/nextcloud_13-rc-fpm-alpine/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_13-rc-fpm/Dockerfile b/nextcloud_13-rc-fpm/Dockerfile
deleted file mode 100644
index ef353c9..0000000
diff --git a/nextcloud_13-rc-fpm/config/apcu.config.php b/nextcloud_13-rc-fpm/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_13-rc-fpm/config/apps.config.php b/nextcloud_13-rc-fpm/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_13-rc-fpm/config/autoconfig.php b/nextcloud_13-rc-fpm/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_13-rc-fpm/cron.sh b/nextcloud_13-rc-fpm/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_13-rc-fpm/entrypoint.sh b/nextcloud_13-rc-fpm/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_13-rc-fpm/upgrade.exclude b/nextcloud_13-rc-fpm/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_13-rc/Dockerfile b/nextcloud_13-rc/Dockerfile
deleted file mode 100644
index f9ba064..0000000
diff --git a/nextcloud_13-rc/config/apache-pretty-urls.config.php b/nextcloud_13-rc/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8..0000000
diff --git a/nextcloud_13-rc/config/apcu.config.php b/nextcloud_13-rc/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_13-rc/config/apps.config.php b/nextcloud_13-rc/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_13-rc/config/autoconfig.php b/nextcloud_13-rc/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_13-rc/cron.sh b/nextcloud_13-rc/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_13-rc/entrypoint.sh b/nextcloud_13-rc/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_13-rc/upgrade.exclude b/nextcloud_13-rc/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_13/Dockerfile b/nextcloud_13/Dockerfile
index d36104a..7cddbb0 100644
--- a/nextcloud_13/Dockerfile
+++ b/nextcloud_13/Dockerfile
@@ -110,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 13.0.10
+ENV NEXTCLOUD_VERSION 13.0.11
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_13/config/redis.config.php b/nextcloud_13/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_13/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_14-rc-fpm-alpine/Dockerfile b/nextcloud_14-rc-fpm-alpine/Dockerfile
deleted file mode 100644
index 8549f70..0000000
diff --git a/nextcloud_14-rc-fpm-alpine/config/apcu.config.php b/nextcloud_14-rc-fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_14-rc-fpm-alpine/config/apps.config.php b/nextcloud_14-rc-fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_14-rc-fpm-alpine/config/autoconfig.php b/nextcloud_14-rc-fpm-alpine/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_14-rc-fpm-alpine/cron.sh b/nextcloud_14-rc-fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_14-rc-fpm-alpine/entrypoint.sh b/nextcloud_14-rc-fpm-alpine/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_14-rc-fpm-alpine/upgrade.exclude b/nextcloud_14-rc-fpm-alpine/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_14-rc-fpm/Dockerfile b/nextcloud_14-rc-fpm/Dockerfile
deleted file mode 100644
index 584daee..0000000
diff --git a/nextcloud_14-rc-fpm/config/apcu.config.php b/nextcloud_14-rc-fpm/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_14-rc-fpm/config/apps.config.php b/nextcloud_14-rc-fpm/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_14-rc-fpm/config/autoconfig.php b/nextcloud_14-rc-fpm/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_14-rc-fpm/cron.sh b/nextcloud_14-rc-fpm/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_14-rc-fpm/entrypoint.sh b/nextcloud_14-rc-fpm/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_14-rc-fpm/upgrade.exclude b/nextcloud_14-rc-fpm/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_14-rc/Dockerfile b/nextcloud_14-rc/Dockerfile
deleted file mode 100644
index 6f6beb3..0000000
diff --git a/nextcloud_14-rc/config/apache-pretty-urls.config.php b/nextcloud_14-rc/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8..0000000
diff --git a/nextcloud_14-rc/config/apcu.config.php b/nextcloud_14-rc/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_14-rc/config/apps.config.php b/nextcloud_14-rc/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_14-rc/config/autoconfig.php b/nextcloud_14-rc/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_14-rc/cron.sh b/nextcloud_14-rc/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_14-rc/entrypoint.sh b/nextcloud_14-rc/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_14-rc/upgrade.exclude b/nextcloud_14-rc/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_production-fpm-alpine/Dockerfile b/nextcloud_production-fpm-alpine/Dockerfile
index 95cae19..b8a8a25 100644
--- a/nextcloud_production-fpm-alpine/Dockerfile
+++ b/nextcloud_production-fpm-alpine/Dockerfile
@@ -91,7 +91,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 14.0.6
+ENV NEXTCLOUD_VERSION 14.0.7
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_production-fpm-alpine/config/redis.config.php b/nextcloud_production-fpm-alpine/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_production-fpm-alpine/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_production-fpm/Dockerfile b/nextcloud_production-fpm/Dockerfile
index 7e7cff2..93a1223 100644
--- a/nextcloud_production-fpm/Dockerfile
+++ b/nextcloud_production-fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 14.0.6
+ENV NEXTCLOUD_VERSION 14.0.7
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_production-fpm/config/redis.config.php b/nextcloud_production-fpm/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_production-fpm/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_production/Dockerfile b/nextcloud_production/Dockerfile
index b0bf50c..070f398 100644
--- a/nextcloud_production/Dockerfile
+++ b/nextcloud_production/Dockerfile
@@ -110,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 14.0.6
+ENV NEXTCLOUD_VERSION 14.0.7
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_production/config/redis.config.php b/nextcloud_production/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_production/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_rc-fpm-alpine/Dockerfile b/nextcloud_rc-fpm-alpine/Dockerfile
deleted file mode 100644
index 675020b..0000000
diff --git a/nextcloud_rc-fpm-alpine/config/apcu.config.php b/nextcloud_rc-fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_rc-fpm-alpine/config/apps.config.php b/nextcloud_rc-fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_rc-fpm-alpine/config/autoconfig.php b/nextcloud_rc-fpm-alpine/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_rc-fpm-alpine/cron.sh b/nextcloud_rc-fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_rc-fpm-alpine/entrypoint.sh b/nextcloud_rc-fpm-alpine/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_rc-fpm-alpine/upgrade.exclude b/nextcloud_rc-fpm-alpine/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_rc-fpm/Dockerfile b/nextcloud_rc-fpm/Dockerfile
deleted file mode 100644
index da13bf0..0000000
diff --git a/nextcloud_rc-fpm/config/apcu.config.php b/nextcloud_rc-fpm/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_rc-fpm/config/apps.config.php b/nextcloud_rc-fpm/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_rc-fpm/config/autoconfig.php b/nextcloud_rc-fpm/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_rc-fpm/cron.sh b/nextcloud_rc-fpm/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_rc-fpm/entrypoint.sh b/nextcloud_rc-fpm/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_rc-fpm/upgrade.exclude b/nextcloud_rc-fpm/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_rc/Dockerfile b/nextcloud_rc/Dockerfile
deleted file mode 100644
index a3b99bd..0000000
diff --git a/nextcloud_rc/config/apache-pretty-urls.config.php b/nextcloud_rc/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8..0000000
diff --git a/nextcloud_rc/config/apcu.config.php b/nextcloud_rc/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
diff --git a/nextcloud_rc/config/apps.config.php b/nextcloud_rc/config/apps.config.php
deleted file mode 100644
index a4bed83..0000000
diff --git a/nextcloud_rc/config/autoconfig.php b/nextcloud_rc/config/autoconfig.php
deleted file mode 100644
index 85e0221..0000000
diff --git a/nextcloud_rc/cron.sh b/nextcloud_rc/cron.sh
deleted file mode 100755
index 4dfa411..0000000
diff --git a/nextcloud_rc/entrypoint.sh b/nextcloud_rc/entrypoint.sh
deleted file mode 100755
index 07644c0..0000000
diff --git a/nextcloud_rc/upgrade.exclude b/nextcloud_rc/upgrade.exclude
deleted file mode 100644
index a1f2de9..0000000
diff --git a/nextcloud_stable-fpm-alpine/Dockerfile b/nextcloud_stable-fpm-alpine/Dockerfile
index 1e5b23f..10f4ff1 100644
--- a/nextcloud_stable-fpm-alpine/Dockerfile
+++ b/nextcloud_stable-fpm-alpine/Dockerfile
@@ -91,7 +91,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 15.0.2
+ENV NEXTCLOUD_VERSION 15.0.4
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_stable-fpm-alpine/config/redis.config.php b/nextcloud_stable-fpm-alpine/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_stable-fpm-alpine/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_stable-fpm/Dockerfile b/nextcloud_stable-fpm/Dockerfile
index 0e6ffcd..6254415 100644
--- a/nextcloud_stable-fpm/Dockerfile
+++ b/nextcloud_stable-fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 15.0.2
+ENV NEXTCLOUD_VERSION 15.0.4
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_stable-fpm/config/redis.config.php b/nextcloud_stable-fpm/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_stable-fpm/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+
diff --git a/nextcloud_stable/Dockerfile b/nextcloud_stable/Dockerfile
index 09e8784..409b803 100644
--- a/nextcloud_stable/Dockerfile
+++ b/nextcloud_stable/Dockerfile
@@ -110,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 15.0.2
+ENV NEXTCLOUD_VERSION 15.0.4
RUN set -ex; \
fetchDeps=" \
diff --git a/nextcloud_stable/config/redis.config.php b/nextcloud_stable/config/redis.config.php
new file mode 100644
index 0000000..5df799f
--- /dev/null
+++ b/nextcloud_stable/config/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
+ ),
+ );
+}
+ |
|
Build test of #5413; dae0647; $ bashbrew build nextcloud:13.0.11-apache
Building bashbrew/cache:d4d8050a79b75fb424681fa745869cfa9a5de73c2590ad3987b8e64897eae20a (nextcloud:13.0.11-apache)
Tagging nextcloud:13.0.11-apache
Tagging nextcloud:13.0-apache
Tagging nextcloud:13-apache
Tagging nextcloud:13.0.11
Tagging nextcloud:13.0
Tagging nextcloud:13
$ test/run.sh nextcloud:13.0.11-apache
testing nextcloud:13.0.11-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:13.0.11-fpm-alpine
Building bashbrew/cache:71cb9d35bf487cd37afddb4ce4398c8c0fd37096b7442c423639c1deb152243e (nextcloud:13.0.11-fpm-alpine)
Tagging nextcloud:13.0.11-fpm-alpine
Tagging nextcloud:13.0-fpm-alpine
Tagging nextcloud:13-fpm-alpine
$ test/run.sh nextcloud:13.0.11-fpm-alpine
testing nextcloud:13.0.11-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:13.0.11-fpm
Building bashbrew/cache:ebd10247ff299c2588b04017b75f12750f65fe0e4d0cf5848db9f43980501926 (nextcloud:13.0.11-fpm)
Tagging nextcloud:13.0.11-fpm
Tagging nextcloud:13.0-fpm
Tagging nextcloud:13-fpm
$ test/run.sh nextcloud:13.0.11-fpm
testing nextcloud:13.0.11-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:14.0.7-apache
Building bashbrew/cache:60bf82c663a44483acdad9d6896618ec79706cfa449e050da590b4a47d8221de (nextcloud:14.0.7-apache)
Tagging nextcloud:14.0.7-apache
Tagging nextcloud:14.0-apache
Tagging nextcloud:14-apache
Tagging nextcloud:production-apache
Tagging nextcloud:14.0.7
Tagging nextcloud:14.0
Tagging nextcloud:14
Tagging nextcloud:production
$ test/run.sh nextcloud:14.0.7-apache
testing nextcloud:14.0.7-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:14.0.7-fpm-alpine
Building bashbrew/cache:5d637845b6ac7e75161f15e50235699018a13ae7f368435273cb72a7ee9792a1 (nextcloud:14.0.7-fpm-alpine)
Tagging nextcloud:14.0.7-fpm-alpine
Tagging nextcloud:14.0-fpm-alpine
Tagging nextcloud:14-fpm-alpine
Tagging nextcloud:production-fpm-alpine
$ test/run.sh nextcloud:14.0.7-fpm-alpine
testing nextcloud:14.0.7-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:14.0.7-fpm
Building bashbrew/cache:e15630aa139167b8c3b231e432133325dbd09a0a7296ea66f8d2c1841b603031 (nextcloud:14.0.7-fpm)
Tagging nextcloud:14.0.7-fpm
Tagging nextcloud:14.0-fpm
Tagging nextcloud:14-fpm
Tagging nextcloud:production-fpm
$ test/run.sh nextcloud:14.0.7-fpm
testing nextcloud:14.0.7-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:15.0.4-apache
Building bashbrew/cache:a812888035b334d94fd35234d3663f5bc6de511bb3744b174ed136aabe80f68f (nextcloud:15.0.4-apache)
Tagging nextcloud:15.0.4-apache
Tagging nextcloud:15.0-apache
Tagging nextcloud:15-apache
Tagging nextcloud:apache
Tagging nextcloud:stable-apache
Tagging nextcloud:15.0.4
Tagging nextcloud:15.0
Tagging nextcloud:15
Tagging nextcloud:latest
Tagging nextcloud:stable
$ test/run.sh nextcloud:15.0.4-apache
testing nextcloud:15.0.4-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:15.0.4-fpm-alpine
Building bashbrew/cache:452fdcb260a7fa7fe1ad4a3a0bfe7217ea3738d6c463d428bb2fb6474b2ff084 (nextcloud:15.0.4-fpm-alpine)
Tagging nextcloud:15.0.4-fpm-alpine
Tagging nextcloud:15.0-fpm-alpine
Tagging nextcloud:15-fpm-alpine
Tagging nextcloud:fpm-alpine
Tagging nextcloud:stable-fpm-alpine
$ test/run.sh nextcloud:15.0.4-fpm-alpine
testing nextcloud:15.0.4-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build nextcloud:15.0.4-fpm
Building bashbrew/cache:1863d4685ccd05667b44f03c8cbefce394eef8bd12a5496a4c6a56a1e9ff52ed (nextcloud:15.0.4-fpm)
Tagging nextcloud:15.0.4-fpm
Tagging nextcloud:15.0-fpm
Tagging nextcloud:15-fpm
Tagging nextcloud:fpm
Tagging nextcloud:stable-fpm
$ test/run.sh nextcloud:15.0.4-fpm
testing nextcloud:15.0.4-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
nextcloud/docker@ba4c135
nextcloud/docker@f2ee88d
nextcloud/docker@536fb66
nextcloud/docker@d1db681
nextcloud/docker@a9f458c
nextcloud/docker@2e481a8
nextcloud/docker@b3b6def
nextcloud/docker@d3cd3b8
nextcloud/docker@e0de4ab
nextcloud/docker@da1192e
nextcloud/docker@cd72548
nextcloud/docker@6b8820f
nextcloud/docker@2695fd9
nextcloud/docker@6d7be41
nextcloud/docker@b9ae325
nextcloud/docker@f2397fa...b9ae325
CC: @tilosp