diff --git a/ansible/provision/group_vars/all/main.yml b/ansible/provision/group_vars/all/main.yml index 7b48bfa5..4f6b3c94 100644 --- a/ansible/provision/group_vars/all/main.yml +++ b/ansible/provision/group_vars/all/main.yml @@ -74,7 +74,7 @@ mariadb_slow_query_log_enabled: false # PHP -php7_version: 7.3 +php7_version: 7.4 php7_enable_fpm: yes php7_extensions: [ apcu ] diff --git a/docker/php-cli/Dockerfile b/docker/php-cli/Dockerfile index f7a609fb..5cf90bed 100644 --- a/docker/php-cli/Dockerfile +++ b/docker/php-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-cli-alpine +FROM php:7.4-cli-alpine # Install PDO_mysql RUN docker-php-ext-install pdo_mysql @@ -8,7 +8,8 @@ RUN apk --no-cache add --virtual .build-dependencies \ autoconf \ g++ \ make \ - && pecl install xdebug-2.8.0 \ + && pecl channel-update pecl.php.net \ + && pecl install xdebug-2.8.1 \ && apk --no-cache del .build-dependencies COPY xdebug.ini ${PHP_INI_DIR}/conf.d/xdebug.ini diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 06f4be53..7af936c3 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-fpm-alpine +FROM php:7.4-fpm-alpine # Install PDO_mysql RUN docker-php-ext-install pdo_mysql @@ -8,7 +8,8 @@ RUN apk --no-cache add --virtual .build-dependencies \ autoconf \ g++ \ make \ - && pecl install xdebug-2.8.0 \ + && pecl channel-update pecl.php.net \ + && pecl install xdebug-2.8.1 \ && apk --no-cache del .build-dependencies COPY xdebug.ini ${PHP_INI_DIR}/conf.d/xdebug.ini