Merge pull request #416 from nextcloud/php-7.2

Switch to php 7.2 for nextcloud 13.0 and greater
This commit is contained in:
Tilo Spannagel 2018-08-08 11:42:48 +02:00 committed by GitHub
commit e4b29de140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 8 additions and 18 deletions

View File

@ -43,7 +43,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -37,7 +37,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -43,7 +43,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-apache-stretch FROM php:7.2-apache-stretch
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -43,7 +43,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.1-fpm-alpine3.7 FROM php:7.2-fpm-alpine3.7
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -37,7 +37,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-fpm-stretch FROM php:7.2-fpm-stretch
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -43,7 +43,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-apache-stretch FROM php:7.2-apache-stretch
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -43,7 +43,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
FROM php:7.1-fpm-alpine3.7 FROM php:7.2-fpm-alpine3.7
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -37,7 +37,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
FROM php:7.1-fpm-stretch FROM php:7.2-fpm-stretch
# entrypoint.sh and cron.sh dependencies # entrypoint.sh and cron.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -43,7 +43,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -36,7 +36,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -42,7 +42,6 @@ RUN set -ex; \
gd \ gd \
intl \ intl \
ldap \ ldap \
mcrypt \
opcache \ opcache \
pcntl \ pcntl \
pdo_mysql \ pdo_mysql \

View File

@ -2,7 +2,8 @@
set -eo pipefail set -eo pipefail
declare -A php_version=( declare -A php_version=(
[default]='7.1' [default]='7.2'
[12.0]='7.1'
) )
declare -A cmd=( declare -A cmd=(