From 1dac382827c392f33a18aa59ff13ab4865277416 Mon Sep 17 00:00:00 2001 From: Abdelrahman Omran Date: Tue, 13 Nov 2018 16:30:41 +0400 Subject: [PATCH] Drop the useless PHP tokenizer extension install step (#1650) It is bundled and enabled by default in the PHP language already, and adding this step raises a warning: warning: tokenizer (tokenizer.so) is already loaded! Also if this option disabled, it's still installed as part of the language anyway! --- docker-compose.yml | 1 - env-example | 1 - php-fpm/Dockerfile | 9 --------- 3 files changed, 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 91e62b7e..2f9ff025 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -143,7 +143,6 @@ services: - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI} - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL} - INSTALL_PG_CLIENT=${PHP_FPM_INSTALL_PG_CLIENT} - - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER} - INSTALL_INTL=${PHP_FPM_INSTALL_INTL} - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT} - INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP} diff --git a/env-example b/env-example index da60341a..e975f780 100644 --- a/env-example +++ b/env-example @@ -134,7 +134,6 @@ WORKSPACE_SSH_PORT=2222 PHP_FPM_INSTALL_ZIP_ARCHIVE=true PHP_FPM_INSTALL_BCMATH=true PHP_FPM_INSTALL_MYSQLI=true -PHP_FPM_INSTALL_TOKENIZER=true PHP_FPM_INSTALL_INTL=true PHP_FPM_INSTALL_IMAGEMAGICK=true PHP_FPM_INSTALL_OPCACHE=true diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 760ffd7c..427214e7 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -392,15 +392,6 @@ RUN if [ ${INSTALL_MYSQLI} = true ]; then \ docker-php-ext-install mysqli \ ;fi -########################################################################### -# Tokenizer Modifications: -########################################################################### - -ARG INSTALL_TOKENIZER=false - -RUN if [ ${INSTALL_TOKENIZER} = true ]; then \ - docker-php-ext-install tokenizer \ -;fi ########################################################################### # Human Language and Character Encoding Support: