Merge pull request #3 from nextcloud/master

Merge master back
2025-03-17 11:55:08 +01:00 · 2018-11-26 14:52:14 +01:00 · 2018-11-26 14:52:14 +01:00 · 1c5bc71b61
commit 1c5bc71b61
parent 6ee05c2f45 ceba099589
63 changed files with 88 additions and 94 deletions
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  redis:
-    image: redis
+    image: redis:alpine
    restart: always

  app:
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+FROM nextcloud:fpm-alpine

 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  redis:
-    image: redis
+    image: redis:alpine
    restart: always

  app:
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
    restart: always
    volumes:
      - nextcloud:/var/www/html
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@ -2,7 +2,7 @@ version: '3'

 services:
  db:
-    image: postgres
+    image: postgres:alpine
    restart: always
    volumes:
      - db:/var/lib/postgresql/data
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@ -2,7 +2,7 @@ version: '3'

 services:
  db:
-    image: postgres
+    image: postgres:alpine
    restart: always
    volumes:
      - db:/var/lib/postgresql/data
@ -10,7 +10,7 @@ services:
      - db.env

  app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
    restart: always
    volumes:
      - nextcloud:/var/www/html
--- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
    restart: always
    volumes:
      - nextcloud:/var/www/html
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  redis:
-    image: redis
+    image: redis:alpine
    restart: always

  app:
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+FROM nextcloud:fpm-alpine

 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  redis:
-    image: redis
+    image: redis:alpine
    restart: always

  app:
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@ -13,7 +13,7 @@ services:
      - db.env

  app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
    restart: always
    volumes:
      - nextcloud:/var/www/html
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@ -2,7 +2,7 @@ version: '3'

 services:
  db:
-    image: postgres
+    image: postgres:alpine
    restart: always
    volumes:
      - db:/var/lib/postgresql/data
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@ -2,7 +2,7 @@ version: '3'

 services:
  db:
-    image: postgres
+    image: postgres:alpine
    restart: always
    volumes:
      - db:/var/lib/postgresql/data
@ -10,7 +10,7 @@ services:
      - db.env

  app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
    restart: always
    volumes:
      - nextcloud:/var/www/html
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine

 COPY nginx.conf /etc/nginx/nginx.conf
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;

 error_log  /var/log/nginx/error.log warn;
--- a/.travis.yml
+++ b/.travis.yml
@ -50,12 +50,12 @@ jobs:
        - ./generate-stackbrew-library.sh

    - stage: test images
-      env: VERSION=15.0-beta VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=15.0-beta VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=15.0-beta VARIANT=fpm ARCH=amd64
-    - env: VERSION=15.0-beta VARIANT=fpm ARCH=i386
-    - env: VERSION=15.0-beta VARIANT=apache ARCH=amd64
-    - env: VERSION=15.0-beta VARIANT=apache ARCH=i386
+      env: VERSION=15.0-rc VARIANT=fpm-alpine ARCH=amd64
+    - env: VERSION=15.0-rc VARIANT=fpm-alpine ARCH=i386
+    - env: VERSION=15.0-rc VARIANT=fpm ARCH=amd64
+    - env: VERSION=15.0-rc VARIANT=fpm ARCH=i386
+    - env: VERSION=15.0-rc VARIANT=apache ARCH=amd64
+    - env: VERSION=15.0-rc VARIANT=apache ARCH=i386
    - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64
    - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386
    - env: VERSION=12.0 VARIANT=fpm ARCH=amd64
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\
    } > /etc/apache2/conf-available/remoteip.conf;\
    a2enconf remoteip

-ENV NEXTCLOUD_VERSION 12.0.12
+ENV NEXTCLOUD_VERSION 12.0.13

 RUN set -ex; \
    fetchDeps=" \
@ -122,7 +122,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@ -45,9 +45,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -87,7 +87,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 12.0.12
+ENV NEXTCLOUD_VERSION 12.0.13

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -101,7 +101,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -98,7 +98,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 12.0.12
+ENV NEXTCLOUD_VERSION 12.0.13

 RUN set -ex; \
    fetchDeps=" \
@ -114,7 +114,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\
    } > /etc/apache2/conf-available/remoteip.conf;\
    a2enconf remoteip

-ENV NEXTCLOUD_VERSION 13.0.7
+ENV NEXTCLOUD_VERSION 13.0.8

 RUN set -ex; \
    fetchDeps=" \
@ -122,7 +122,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@ -45,9 +45,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -87,7 +87,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 13.0.7
+ENV NEXTCLOUD_VERSION 13.0.8

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -101,7 +101,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -98,7 +98,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 13.0.7
+ENV NEXTCLOUD_VERSION 13.0.8

 RUN set -ex; \
    fetchDeps=" \
@ -114,7 +114,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\
    } > /etc/apache2/conf-available/remoteip.conf;\
    a2enconf remoteip

-ENV NEXTCLOUD_VERSION 14.0.3
+ENV NEXTCLOUD_VERSION 14.0.4

 RUN set -ex; \
    fetchDeps=" \
@ -122,7 +122,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@ -45,9 +45,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -87,7 +87,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 14.0.3
+ENV NEXTCLOUD_VERSION 14.0.4

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -101,7 +101,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -98,7 +98,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 14.0.3
+ENV NEXTCLOUD_VERSION 14.0.4

 RUN set -ex; \
    fetchDeps=" \
@ -114,7 +114,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/15.0-beta/apache/Dockerfile
+++ b/15.0-beta/apache/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -106,7 +106,7 @@ RUN a2enmod rewrite remoteip ;\
    } > /etc/apache2/conf-available/remoteip.conf;\
    a2enconf remoteip

-ENV NEXTCLOUD_VERSION 15.0.0beta1
+ENV NEXTCLOUD_VERSION 15.0.0RC1

 RUN set -ex; \
    fetchDeps=" \
@ -122,7 +122,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/15.0-beta/apache/config/apache-pretty-urls.config.php
+++ b/15.0-beta/apache/config/apache-pretty-urls.config.php
--- a/15.0-beta/apache/config/apcu.config.php
+++ b/15.0-beta/apache/config/apcu.config.php
--- a/15.0-beta/apache/config/apps.config.php
+++ b/15.0-beta/apache/config/apps.config.php
--- a/15.0-beta/apache/config/autoconfig.php
+++ b/15.0-beta/apache/config/autoconfig.php
--- a/15.0-beta/apache/cron.sh
+++ b/15.0-beta/apache/cron.sh
--- a/15.0-beta/apache/entrypoint.sh
+++ b/15.0-beta/apache/entrypoint.sh
--- a/15.0-beta/apache/upgrade.exclude
+++ b/15.0-beta/apache/upgrade.exclude
--- a/15.0-beta/fpm-alpine/Dockerfile
+++ b/15.0-beta/fpm-alpine/Dockerfile
@ -45,9 +45,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -87,7 +87,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 15.0.0beta1
+ENV NEXTCLOUD_VERSION 15.0.0RC1

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -101,7 +101,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/15.0-beta/fpm-alpine/config/apcu.config.php
+++ b/15.0-beta/fpm-alpine/config/apcu.config.php
--- a/15.0-beta/fpm-alpine/config/apps.config.php
+++ b/15.0-beta/fpm-alpine/config/apps.config.php
--- a/15.0-beta/fpm-alpine/config/autoconfig.php
+++ b/15.0-beta/fpm-alpine/config/autoconfig.php
--- a/15.0-beta/fpm-alpine/cron.sh
+++ b/15.0-beta/fpm-alpine/cron.sh
--- a/15.0-beta/fpm-alpine/entrypoint.sh
+++ b/15.0-beta/fpm-alpine/entrypoint.sh
--- a/15.0-beta/fpm-alpine/upgrade.exclude
+++ b/15.0-beta/fpm-alpine/upgrade.exclude
--- a/15.0-beta/fpm/Dockerfile
+++ b/15.0-beta/fpm/Dockerfile
@ -51,9 +51,9 @@ 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.12; \
+    pecl install APCu-5.1.14; \
    pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
    \
    docker-php-ext-enable \
        apcu \
@ -98,7 +98,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 15.0.0beta1
+ENV NEXTCLOUD_VERSION 15.0.0RC1

 RUN set -ex; \
    fetchDeps=" \
@ -114,7 +114,7 @@ RUN set -ex; \
        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/15.0-beta/fpm/config/apcu.config.php
+++ b/15.0-beta/fpm/config/apcu.config.php
--- a/15.0-beta/fpm/config/apps.config.php
+++ b/15.0-beta/fpm/config/apps.config.php
--- a/15.0-beta/fpm/config/autoconfig.php
+++ b/15.0-beta/fpm/config/autoconfig.php
--- a/15.0-beta/fpm/cron.sh
+++ b/15.0-beta/fpm/cron.sh
--- a/15.0-beta/fpm/entrypoint.sh
+++ b/15.0-beta/fpm/entrypoint.sh
--- a/15.0-beta/fpm/upgrade.exclude
+++ b/15.0-beta/fpm/upgrade.exclude
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -100,7 +100,7 @@ RUN set -ex; \
        "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -113,7 +113,7 @@ RUN set -ex; \
        "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
    gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
    tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
    gpgconf --kill all; \
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@ -2,8 +2,8 @@
 set -Eeuo pipefail

 declare -A release_channel=(
-	[production]='13.0.7'
-	[stable]='13.0.7'
+	[production]='13.0.8'
+	[stable]='14.0.4'
 )

 self="$(basename "$BASH_SOURCE")"
--- a/update.sh
+++ b/update.sh
@ -25,9 +25,9 @@ declare -A extras=(
 )

 declare -A pecl_versions=(
-	[APCu]='5.1.12'
+	[APCu]='5.1.14'
 	[memcached]='3.0.4'
-	[redis]='4.1.1'
+	[redis]='4.2.0'
 )

 variants=(
@ -97,7 +97,7 @@ function create_variant() {
 	fi

 	for arch in i386 amd64; do
-		travisEnv='\n    - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
+		travisEnv='    - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch"'\n'"$travisEnv"
 	done
 }

@ -160,9 +160,10 @@ for version in "${versions_beta[@]}"; do
 	fi
 done

+# remove everything after '- stage: test images'
+travis="$(awk '!p; /- stage: test images/ {p=1}' .travis.yml)"
+echo "$travis" > .travis.yml
+
 # replace the fist '-' with ' '
 travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')"
-
-# update .travis.yml
-travis="$(awk -v 'RS=\n\n' '$1 == "-" && $2 == "stage:" && $3 == "test" && $4 == "images" { $0 = "    - stage: test images'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
-echo "$travis"  > .travis.yml
+printf "$travisEnv" >> .travis.yml