diff --git a/.env.example b/.env.example index c3055bab..1d66fa42 100644 --- a/.env.example +++ b/.env.example @@ -288,6 +288,7 @@ PHP_WORKER_INSTALL_GNUPG=false PHP_WORKER_INSTALL_PGSQL=false PHP_WORKER_INSTALL_MONGO=false PHP_WORKER_INSTALL_BCMATH=false +PHP_WORKER_INSTALL_MEMCACHED=false # PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version PHP_WORKER_INSTALL_OCI8=false PHP_WORKER_INSTALL_PHALCON=false diff --git a/docker-compose.yml b/docker-compose.yml index 86202e64..f162cbdd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -318,6 +318,7 @@ services: - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL} - INSTALL_MONGO=${PHP_WORKER_INSTALL_MONGO} - INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH} + - INSTALL_MEMCACHED=${PHP_WORKER_INSTALL_MEMCACHED} - INSTALL_OCI8=${PHP_WORKER_INSTALL_OCI8} - INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON} - INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP} diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index f0ca0a96..9f4bfb23 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -23,7 +23,6 @@ RUN apk --update add wget \ curl \ git \ build-base \ - libmemcached-dev \ libmcrypt-dev \ libxml2-dev \ pcre-dev \ @@ -40,13 +39,6 @@ RUN apk --update add wget \ RUN pecl channel-update pecl.php.net; \ docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl -RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ - pecl install memcached-2.2.0 mcrypt-1.0.1; \ - else \ - pecl install memcached mcrypt-1.0.1; \ - fi; \ - docker-php-ext-enable memcached - # Add a non-root user: ARG PUID=1000 ENV PUID ${PUID} @@ -404,6 +396,24 @@ RUN if [ ${INSTALL_XMLRPC} = true ]; then \ php -m | grep -r 'xmlrpc'; \ fi +########################################################################### +# PHP Memcached: +########################################################################### + +ARG INSTALL_MEMCACHED=false + +RUN if [ ${INSTALL_MEMCACHED} = true ]; then \ + apk --update add libmemcached-dev; \ + # Install the php memcached extension + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install memcached-2.2.0; \ + else \ + pecl install memcached; \ + fi; \ + docker-php-ext-enable memcached; \ + php -m | grep -r 'memcached'; \ +fi + # #-------------------------------------------------------------------------- # Optional Supervisord Configuration