From 53b3ad0f7ea0afee7775bf10ed18b16ebd236689 Mon Sep 17 00:00:00 2001 From: Eugene Kirdzei Date: Thu, 31 Aug 2017 16:41:01 +0300 Subject: [PATCH 01/16] Fix Php Redis extension installation --- docker-compose.yml | 1 + env-example | 1 + php-fpm/Dockerfile-71 | 2 +- workspace/Dockerfile-71 | 15 ++++++++++++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2173df74..fcd2342b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE} - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP} - INSTALL_MONGO=${WORKSPACE_INSTALL_MONGO} + - INSTALL_PHPREDIS=${WORKSPACE_INSTALL_PHPREDIS} - INSTALL_MSSQL=${WORKSPACE_INSTALL_MSSQL} - INSTALL_NODE=${WORKSPACE_INSTALL_NODE} - INSTALL_YARN=${WORKSPACE_INSTALL_YARN} diff --git a/env-example b/env-example index 15beb1a2..fd73b994 100644 --- a/env-example +++ b/env-example @@ -32,6 +32,7 @@ PHP_INTERPRETER=php-fpm WORKSPACE_INSTALL_XDEBUG=false WORKSPACE_INSTALL_SOAP=false WORKSPACE_INSTALL_MONGO=false +WORKSPACE_INSTALL_PHPREDIS=false WORKSPACE_INSTALL_MSSQL=false WORKSPACE_INSTALL_NODE=false WORKSPACE_INSTALL_YARN=false diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 90ea2bd0..411e12d7 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -84,7 +84,7 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ # Install Php Redis Extension - pecl install -o -f redis \ + printf "\n" | pecl install -o -f redis \ && rm -rf /tmp/pear \ && docker-php-ext-enable redis \ ;fi diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b0320e6b..72b3f770 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -186,11 +186,24 @@ ARG INSTALL_MONGO=false ENV INSTALL_MONGO ${INSTALL_MONGO} RUN if [ ${INSTALL_MONGO} = true ]; then \ # Install the mongodb extension - pecl install mongodb && \ + pecl -q install mongodb && \ echo "extension=mongodb.so" >> /etc/php/7.1/mods-available/mongodb.ini && \ ln -s /etc/php/7.1/mods-available/mongodb.ini /etc/php/7.1/cli/conf.d/30-mongodb.ini \ ;fi +##################################### +# PHP REDIS EXTENSION FOR PHP 7 +##################################### + +ARG INSTALL_PHPREDIS=false +ENV INSTALL_PHPREDIS ${INSTALL_PHPREDIS} +RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ + # Install Php Redis extension + printf "\n" | pecl -q install -o -f redis && \ + echo "extension=redis.so" >> /etc/php/7.1/mods-available/redis.ini && \ + phpenmod redis \ +;fi + ##################################### # Drush: ##################################### From cddc934e1e89c2b8af814e5b41b3e9204a5960fe Mon Sep 17 00:00:00 2001 From: Eugene Kirdzei Date: Mon, 4 Sep 2017 11:33:14 +0300 Subject: [PATCH 02/16] Fix phpreddis installation for all versions of php --- php-fpm/Dockerfile-56 | 2 +- php-fpm/Dockerfile-70 | 2 +- workspace/Dockerfile-56 | 13 +++++++++++++ workspace/Dockerfile-70 | 13 +++++++++++++ workspace/Dockerfile-71 | 2 +- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 1d8fd976..1b240c45 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -87,7 +87,7 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ # Install Php Redis Extension - pecl install -o -f redis \ + printf "\n" | pecl install -o -f redis \ && rm -rf /tmp/pear \ && docker-php-ext-enable redis \ ;fi diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index b643a384..1028fbc9 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -84,7 +84,7 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_PHPREDIS=false RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ # Install Php Redis Extension - pecl install -o -f redis \ + printf "\n" | pecl install -o -f redis \ && rm -rf /tmp/pear \ && docker-php-ext-enable redis \ ;fi diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index a5ba7889..5e775e54 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -194,6 +194,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ ln -s /etc/php/5.6/mods-available/mongodb.ini /etc/php/5.6/cli/conf.d/30-mongodb.ini \ ;fi +##################################### +# PHP REDIS EXTENSION FOR PHP 5.6 +##################################### + +ARG INSTALL_PHPREDIS=false +ENV INSTALL_PHPREDIS ${INSTALL_PHPREDIS} +RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ + # Install Php Redis extension + printf "\n" | pecl -q install -o -f redis && \ + echo "extension=redis.so" >> /etc/php/5.6/mods-available/redis.ini && \ + phpenmod redis \ +;fi + ##################################### # Drush: ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 3d1cde55..48443a2b 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -194,6 +194,19 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ ln -s /etc/php/7.0/mods-available/mongodb.ini /etc/php/7.0/cli/conf.d/30-mongodb.ini \ ;fi +##################################### +# PHP REDIS EXTENSION FOR PHP 7 +##################################### + +ARG INSTALL_PHPREDIS=false +ENV INSTALL_PHPREDIS ${INSTALL_PHPREDIS} +RUN if [ ${INSTALL_PHPREDIS} = true ]; then \ + # Install Php Redis extension + printf "\n" | pecl -q install -o -f redis && \ + echo "extension=redis.so" >> /etc/php/7.0/mods-available/redis.ini && \ + phpenmod redis \ +;fi + ##################################### # Drush: ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 72b3f770..cba070d5 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -192,7 +192,7 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \ ;fi ##################################### -# PHP REDIS EXTENSION FOR PHP 7 +# PHP REDIS EXTENSION FOR PHP 7.1 ##################################### ARG INSTALL_PHPREDIS=false From a36620c3bd4e297839f85272efecb6dac74ac438 Mon Sep 17 00:00:00 2001 From: Eugene Kirdzei Date: Mon, 4 Sep 2017 12:05:34 +0300 Subject: [PATCH 03/16] Restart build --- php-fpm/Dockerfile-71 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 411e12d7..b58a0ee3 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -78,7 +78,7 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ;fi ##################################### -# PHP REDIS EXTENSION FOR PHP 7 +# PHP REDIS EXTENSION FOR PHP 7.0 ##################################### ARG INSTALL_PHPREDIS=false From b61ff4f484c2d9477a2a6b0e4a4486aa8524e130 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 02:36:24 +0300 Subject: [PATCH 04/16] Added support of ImageMagick --- docker-compose.yml | 1 + env-example | 1 + workspace/Dockerfile-56 | 10 ++++++++++ workspace/Dockerfile-70 | 10 ++++++++++ workspace/Dockerfile-71 | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index fcd2342b..3f7506f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,7 @@ services: - INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY} - INSTALL_PYTHON=${WORKSPACE_INSTALL_PYTHON} - INSTALL_IMAGE_OPTIMIZERS=${WORKSPACE_INSTALL_IMAGE_OPTIMIZERS} + - INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} - NODE_VERSION=${WORKSPACE_NODE_VERSION} diff --git a/env-example b/env-example index fd73b994..6302c697 100644 --- a/env-example +++ b/env-example @@ -50,6 +50,7 @@ WORKSPACE_INSTALL_MC=false WORKSPACE_INSTALL_SYMFONY=false WORKSPACE_INSTALL_PYTHON=false WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false +WORKSPACE_INSTALL_IMAGEMAGICK=false WORKSPACE_PUID=1000 WORKSPACE_PGID=1000 WORKSPACE_NODE_VERSION=stable diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 5e775e54..cbc10baa 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -496,6 +496,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \ && pip install --upgrade virtualenv \ ;fi +##################################### +# ImageMagick: +##################################### +USER root +ARG INSTALL_IMAGEMAGICK=false +ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} +RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get install -y --force-yes imagemagick php-imagick && \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 48443a2b..a6d38e69 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -577,6 +577,16 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \ && pip install --upgrade virtualenv \ ;fi +##################################### +# ImageMagick: +##################################### +USER root +ARG INSTALL_IMAGEMAGICK=false +ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} +RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get install -y --force-yes imagemagick php-imagick && \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index cba070d5..c1ad0f6c 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -582,6 +582,15 @@ RUN if [ ${INSTALL_PYTHON} = true ]; then \ && pip install --upgrade virtualenv \ ;fi +##################################### +# ImageMagick: +##################################### +USER root +ARG INSTALL_IMAGEMAGICK=false +ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} +RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get install -y --force-yes imagemagick php-imagick && \ +;fi # #-------------------------------------------------------------------------- From f9e6acd4e19e1aeca8f6f028a6ab24c389b25a7d Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 03:15:24 +0300 Subject: [PATCH 05/16] Fix syntax error --- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index cbc10baa..de180687 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -503,7 +503,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick && \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index a6d38e69..9ca8e6c0 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -584,7 +584,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick && \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index c1ad0f6c..b6f423fd 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -589,7 +589,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick && \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # From e56801846b778c51fab653785a2e07f9abe31cd0 Mon Sep 17 00:00:00 2001 From: wanchia Date: Tue, 5 Sep 2017 11:06:53 +0800 Subject: [PATCH 06/16] add ENV PATH, fix the problem of docker-compose exec workspace npm(or other node-related script). --- workspace/Dockerfile-56 | 3 +++ workspace/Dockerfile-70 | 3 +++ workspace/Dockerfile-71 | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 5e775e54..46c72585 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -276,6 +276,9 @@ RUN if [ ${INSTALL_NODE} = true ]; then \ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \ ;fi +# Add PATH for node +ENV PATH $PATH:$NVM_DIR/versions/node/v${NODE_VERSION}/bin + ##################################### # YARN: ##################################### diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 48443a2b..1f56aa0c 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -276,6 +276,9 @@ RUN if [ ${INSTALL_NODE} = true ]; then \ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \ ;fi +# Add PATH for node +ENV PATH $PATH:$NVM_DIR/versions/node/v${NODE_VERSION}/bin + ##################################### # YARN: ##################################### diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index cba070d5..915a9cf5 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -273,6 +273,10 @@ RUN if [ ${INSTALL_NODE} = true ]; then \ echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \ ;fi +# Add PATH for node +ENV PATH $PATH:$NVM_DIR/versions/node/v${NODE_VERSION}/bin + + ##################################### # YARN: ##################################### From f6552aca97f0483bb48a76f7997e903a154a30c8 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 21:09:34 +0300 Subject: [PATCH 07/16] Added support of ImageMagick to php-fpm --- php-fpm/Dockerfile-56 | 10 ++++++++++ php-fpm/Dockerfile-70 | 10 ++++++++++ php-fpm/Dockerfile-71 | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 1b240c45..7a623e09 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -269,6 +269,16 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ ;fi +##################################### +# ImageMagick: +##################################### +USER root +ARG INSTALL_IMAGEMAGICK=false +ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} +RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get install -y --force-yes imagemagick php-imagick \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 1028fbc9..349f614f 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -293,6 +293,16 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ ;fi +##################################### +# ImageMagick: +##################################### +USER root +ARG INSTALL_IMAGEMAGICK=false +ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} +RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get install -y --force-yes imagemagick php-imagick \ +;fi + # #-------------------------------------------------------------------------- # Final Touch diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index b58a0ee3..63992b88 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -300,6 +300,16 @@ RUN if [ ${INSTALL_IMAGE_OPTIMIZERS} = true ]; then \ apt-get install -y --force-yes jpegoptim optipng pngquant gifsicle \ ;fi +##################################### +# ImageMagick: +##################################### +USER root +ARG INSTALL_IMAGEMAGICK=false +ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} +RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get install -y --force-yes imagemagick php-imagick \ +;fi + # #-------------------------------------------------------------------------- # Final Touch From 0a23d53ee5640936f52836338b06dd82da7331b3 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 21:47:47 +0300 Subject: [PATCH 08/16] Move php-imagick to php-fpm and enable it --- php-fpm/Dockerfile-56 | 3 ++- php-fpm/Dockerfile-70 | 3 ++- php-fpm/Dockerfile-71 | 3 ++- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 7a623e09..0caf4d3f 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -276,7 +276,8 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick php-imagick && \ + docker-php-ext-enable imagick \ ;fi # diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 349f614f..264c9bb8 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -300,7 +300,8 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick php-imagick && \ + docker-php-ext-enable imagick \ ;fi # diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 63992b88..66bf4632 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -307,7 +307,8 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick php-imagick && \ + docker-php-ext-enable imagick \ ;fi # diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index de180687..b6e1de22 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -503,7 +503,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick \ ;fi # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 9ca8e6c0..824c4a3e 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -584,7 +584,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick \ ;fi # diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index b6f423fd..3030447b 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -589,7 +589,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick \ + apt-get install -y --force-yes imagemagick \ ;fi # From b2e372054fad67623634260b48a48fbc0ec49386 Mon Sep 17 00:00:00 2001 From: Arhey Date: Tue, 5 Sep 2017 23:36:30 +0300 Subject: [PATCH 09/16] Fixed php-fpm build --- docker-compose.yml | 1 + env-example | 1 + php-fpm/Dockerfile-56 | 4 +++- php-fpm/Dockerfile-70 | 4 +++- php-fpm/Dockerfile-71 | 4 +++- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f7506f0..d7ddf84f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,6 +82,7 @@ services: - INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP} - INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE} - INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS} + - INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK} dockerfile: "Dockerfile-${PHP_VERSION}" volumes_from: - applications diff --git a/env-example b/env-example index 6302c697..34670e71 100644 --- a/env-example +++ b/env-example @@ -78,6 +78,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false PHP_FPM_INSTALL_LDAP=false PHP_FPM_INSTALL_SWOOLE=false PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false +PHP_FPM_INSTALL_IMAGEMAGICK=false ### NGINX ############################################################################################################## diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 0caf4d3f..6c1d19e2 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -276,7 +276,9 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick && \ + apt-get update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ docker-php-ext-enable imagick \ ;fi diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index 264c9bb8..c1bdcd10 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -300,7 +300,9 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick && \ + apt-get update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ docker-php-ext-enable imagick \ ;fi diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 66bf4632..74682248 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -307,7 +307,9 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick php-imagick && \ + apt-get update -y && \ + apt-get install -y libmagickwand-dev imagemagick && \ + pecl install imagick && \ docker-php-ext-enable imagick \ ;fi diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index b6e1de22..de180687 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -503,7 +503,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 824c4a3e..9ca8e6c0 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -584,7 +584,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 3030447b..b6f423fd 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -589,7 +589,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false ENV INSTALL_IMAGEMAGICK ${INSTALL_IMAGEMAGICK} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y --force-yes imagemagick \ + apt-get install -y --force-yes imagemagick php-imagick \ ;fi # From 5c5f94600a4430f5932703a74bcca5a922fd0b81 Mon Sep 17 00:00:00 2001 From: Arhey Date: Wed, 6 Sep 2017 00:22:18 +0300 Subject: [PATCH 10/16] Rename laravel.pool.conf to xlaravel.pool.conf Fix issue #1011 --- php-fpm/Dockerfile-56 | 2 +- php-fpm/Dockerfile-70 | 2 +- php-fpm/Dockerfile-71 | 2 +- php-fpm/{laravel.pool.conf => xlaravel.pool.conf} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename php-fpm/{laravel.pool.conf => xlaravel.pool.conf} (100%) diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 6c1d19e2..ed8cb892 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -289,7 +289,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ # ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ +ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index c1bdcd10..daf214ab 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -313,7 +313,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ # ADD ./laravel.ini /usr/local/etc/php/conf.d/ -ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ +ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 74682248..1210f292 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -320,7 +320,7 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ # ADD ./laravel.ini /usr/local/etc/php/conf.d -ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/ +ADD ./xlaravel.pool.conf /usr/local/etc/php-fpm.d/ #RUN rm -r /var/lib/apt/lists/* diff --git a/php-fpm/laravel.pool.conf b/php-fpm/xlaravel.pool.conf similarity index 100% rename from php-fpm/laravel.pool.conf rename to php-fpm/xlaravel.pool.conf From 792789e4799d74da4d426b16a5ed835f62bad77c Mon Sep 17 00:00:00 2001 From: "Melchor O. Abcede Jr" Date: Tue, 12 Sep 2017 04:13:44 +0800 Subject: [PATCH 11/16] added eb cli container --- aws/.gitignore | 1 + aws/Dockerfile | 17 +++++++++++++++++ docker-compose.yml | 10 ++++++++++ 3 files changed, 28 insertions(+) create mode 100644 aws/.gitignore create mode 100644 aws/Dockerfile diff --git a/aws/.gitignore b/aws/.gitignore new file mode 100644 index 00000000..46194830 --- /dev/null +++ b/aws/.gitignore @@ -0,0 +1 @@ +./ssh_keys diff --git a/aws/Dockerfile b/aws/Dockerfile new file mode 100644 index 00000000..4f03e9dc --- /dev/null +++ b/aws/Dockerfile @@ -0,0 +1,17 @@ +FROM python:slim + +MAINTAINER melchabcede@gmail.com + +RUN pip install --upgrade --no-cache-dir awsebcli +RUN apt-get -yqq update && apt-get -yqq install git-all + +#NOTE: make sure ssh keys are added to ssh_keys folder + +RUN mkdir root/tmp_ssh +COPY /ssh_keys/. /root/.ssh/ +RUN cd /root/.ssh && chmod 600 * && chmod 644 *.pub + +# Set default work directory +WORKDIR /var/www + + diff --git a/docker-compose.yml b/docker-compose.yml index d7ddf84f..3d8d9d86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -638,6 +638,16 @@ services: - frontend - backend +### AWS EB-CLI #### + aws: + build: + context: ./aws + volumes_from: + - applications + depends_on: + - workspace + tty: true + ### Networks Setup ############################################ networks: From 7ac37ecd350a46db04d21a7d36bf285655918ce9 Mon Sep 17 00:00:00 2001 From: "Melchor O. Abcede Jr" Date: Tue, 12 Sep 2017 04:30:53 +0800 Subject: [PATCH 12/16] added aws docs --- DOCUMENTATION/content/documentation/index.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index f3a77807..78eed6d4 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -922,6 +922,26 @@ docker-compose up -d minio ``` + +
+ +## Use AWS + +1 - Configure AWS: + - make sure to add your SSH keys in aws/ssh_keys folder + +2 - Run the Aws Container (`aws`) with the `docker-compose up` command. Example: + +```bash +docker-compose up -d aws +``` + +3 - Access the aws container with `docker-compose exec aws bash` + +4 - To start using eb cli inside the container, initiaze your project first by doing 'eb init'. Read the [aws eb cli](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3-configuration.html) docs for more details. + + +
From a5f3a92eb417558bbaf8731dcbc347b061a4051b Mon Sep 17 00:00:00 2001 From: Joel Simpson Date: Thu, 14 Sep 2017 17:17:34 -0700 Subject: [PATCH 13/16] Update docker-compose.yml It looks like the 219: user: "1000:50" statement was added a while back to fix a file permissions issue, but on a completely fresh up it keeps mysql from starting, generating the following. Removing the line allowed everything to work properly.: mysql_1 | Initializing database mysql_1 | mysqld: Can't create/write to file '/var/lib/mysql/is_writable' (Errcode: 13 - Permission denied) mysql_1 | 2017-09-14T23:55:30.989254Z 0 [Note] Basedir set to /usr/ mysql_1 | 2017-09-14T23:55:30.989559Z 0 [Warning] The syntax '--symbolic-links/-s' is deprecated and will be removed in a future release mysql_1 | 2017-09-14T23:55:30.989602Z 0 [Warning] 'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release. mysql_1 | 2017-09-14T23:55:30.990877Z 0 [ERROR] --initialize specified but the data directory exists and is not writable. Aborting. mysql_1 | 2017-09-14T23:55:30.990886Z 0 [ERROR] Aborting --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3d8d9d86..4fe71545 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -216,7 +216,6 @@ services: - ${MYSQL_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d ports: - "${MYSQL_PORT}:3306" - user: "1000:50" networks: - backend From e5aef41dd2e1b24483456853ecf1e739a1fbb837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Aur=C3=A9lio=20Deleu?= Date: Mon, 18 Sep 2017 13:07:30 +0200 Subject: [PATCH 14/16] Make it easier to solve nginx build stuck --- DOCUMENTATION/content/documentation/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 78eed6d4..97e51e47 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1680,3 +1680,7 @@ This error sometimes happens because your Laravel application isn't running on t 2. Change the `DB_HOST` variable on env with the IP that you received from previous step. * Option B 1. Change the `DB_HOST` value to the same name as the MySQL docker container. The Laradock docker-compose file currently has this as `mysql` + +## I get stuck when building ngxinx on `fetch http://mirrors.aliyun.com/alpine/v3.5/main/x86_64/APKINDEX.tar.gz` + +As stated on [#749](https://github.com/laradock/laradock/issues/749#issuecomment-293296687), removing the line `RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories` from `nginx/Dockerfile` solves the problem. From 110aa91c591b0cac27f567072477350f21529955 Mon Sep 17 00:00:00 2001 From: Roel Arents Date: Mon, 18 Sep 2017 15:24:48 +0200 Subject: [PATCH 15/16] add APACHE_PHP_UPSTREAM_TIMEOUT --- apache2/Dockerfile | 3 +++ docker-compose.yml | 1 + env-example | 1 + 3 files changed, 5 insertions(+) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index bc152dd3..9624d975 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -4,11 +4,14 @@ MAINTAINER Eric Pfeiffer ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_PORT=9000 +ARG PHP_UPSTREAM_TIMEOUT=60 ENV WEB_PHP_SOCKET=${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT} ENV WEB_DOCUMENT_ROOT=/var/www/ +ENV WEB_PHP_TIMEOUT=${PHP_UPSTREAM_TIMEOUT} + EXPOSE 80 443 WORKDIR /var/www/ diff --git a/docker-compose.yml b/docker-compose.yml index 4fe71545..b44e8b77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -156,6 +156,7 @@ services: args: - PHP_UPSTREAM_CONTAINER=${APACHE_PHP_UPSTREAM_CONTAINER} - PHP_UPSTREAM_PORT=${APACHE_PHP_UPSTREAM_PORT} + - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT} volumes_from: - applications volumes: diff --git a/env-example b/env-example index 34670e71..7357b3ef 100644 --- a/env-example +++ b/env-example @@ -97,6 +97,7 @@ APACHE_HOST_LOG_PATH=./logs/apache2 APACHE_SITES_PATH=./apache2/sites APACHE_PHP_UPSTREAM_CONTAINER=php-fpm APACHE_PHP_UPSTREAM_PORT=9000 +APACHE_PHP_UPSTREAM_TIMEOUT=60 ### MYSQL ############################################################################################################## From 4150f0b14032ed254191dacc85024300b354a014 Mon Sep 17 00:00:00 2001 From: Vjekoslav Nikolic Date: Wed, 20 Sep 2017 05:34:28 -0700 Subject: [PATCH 16/16] Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca841ab621305e0457f7a23505a99df44960 --- nginx/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 77f4abdd..4a491b02 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -7,9 +7,6 @@ ADD nginx.conf /etc/nginx/ ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_PORT=9000 -# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source. -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/' /etc/apk/repositories - RUN apk update \ && apk upgrade \ && apk add --no-cache bash \