Merge branch 'master' of https://github.com/nextcloud/docker

2018-05-11 09:17:00 +02:00 · 2018-05-11 09:17:00 +02:00 · 3086c9db9b
parent 4ee1cf73f1 53e1809aeb
commit 3086c9db9b
9 changed files with 2 additions and 26 deletions
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@ -43,14 +43,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/12.0/fpm-alpine/Dockerfile
+++ b/12.0/fpm-alpine/Dockerfile
@ -37,14 +37,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@ -43,14 +43,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@ -43,14 +43,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@ -37,14 +37,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@ -43,14 +43,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -36,14 +36,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -42,14 +42,11 @@ RUN set -ex; \
        gd \
        intl \
        ldap \
-        mbstring \
        mcrypt \
-        mysqli \
        opcache \
        pcntl \
        pdo_mysql \
        pdo_pgsql \
-        pgsql \
        zip \
    ; \
    pecl install \
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@ -2,8 +2,8 @@
 set -Eeuo pipefail

 declare -A release_channel=(
-	[production]='12.0.6'
-	[stable]='13.0.1'
+	[production]='13.0.2'
+	[stable]='13.0.2'
 )

 self="$(basename "$BASH_SOURCE")"