From 545d50105c9c70586b1166fc32ef37dc62c6c4e5 Mon Sep 17 00:00:00 2001 From: Lorand Gombos Date: Fri, 16 Feb 2018 10:36:22 +0200 Subject: [PATCH 01/20] Update min. docker version --- DOCUMENTATION/content/getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/getting-started/index.md b/DOCUMENTATION/content/getting-started/index.md index 4d088aca..f86e768b 100644 --- a/DOCUMENTATION/content/getting-started/index.md +++ b/DOCUMENTATION/content/getting-started/index.md @@ -7,7 +7,7 @@ weight: 2 ## Requirements - [Git](https://git-scm.com/downloads) -- [Docker](https://www.docker.com/products/docker/) `>= 1.12` +- [Docker](https://www.docker.com/products/docker/) `>= 17.12` From 59f3b574daa5f7e3a943e1a5072b1c38906a5023 Mon Sep 17 00:00:00 2001 From: Adam Clarke Date: Thu, 19 Apr 2018 14:25:19 -0400 Subject: [PATCH 02/20] corrected elasticsearch default username --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index dabde4f0..195d680d 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -828,7 +828,7 @@ docker-compose up -d elasticsearch 2 - Open your browser and visit the localhost on port **9200**: `http://localhost:9200` -> The default username is `user` and the default password is `changeme`. +> The default username is `elastic` and the default password is `changeme`. ### Install ElasticSearch Plugin From f54e6baf0236a0731b4a9e4fdb8313f44b6fee9b Mon Sep 17 00:00:00 2001 From: Sergey Falinsky Date: Fri, 20 Apr 2018 14:12:00 +0300 Subject: [PATCH 03/20] Fix env variable name Fixed env variable name which points to host source directory. --- docker-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-sync.yml b/docker-sync.yml index d637675a..cf750ea3 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -6,7 +6,7 @@ syncs: applications-docker-sync: # name of the intermediary sync volume compose-dev-file-path: 'docker-compose.sync.yml' # docker-compose override file - src: '${APPLICATION}' # host source directory + src: '${APP_CODE_PATH_HOST}' # host source directory sync_userid: 1000 # giving permissions to www-data user (as defined in nginx and php-fpm Dockerfiles) sync_strategy: '${DOCKER_SYNC_STRATEGY}' # for osx use 'native_osx', for windows use 'unison' From 6b6e2d5f86f89acfbc2c9ee50b7d9d54af1b875f Mon Sep 17 00:00:00 2001 From: Douglas Black Date: Tue, 24 Apr 2018 10:25:16 -0400 Subject: [PATCH 04/20] Adding pcntl to php-fpm, php-worker, addresses #1419 --- env-example | 1 + php-fpm/Dockerfile | 10 ++++++++++ php-worker/Dockerfile | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/env-example b/env-example index 87f4cefe..ce76c20f 100644 --- a/env-example +++ b/env-example @@ -138,6 +138,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false PHP_FPM_INSTALL_LDAP=false PHP_FPM_INSTALL_SWOOLE=false PHP_FPM_INSTALL_PG_CLIENT=false +PHP_FPM_INSTALL_PCNTL=false ### PHP_WORKER ############################################ diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index c062f424..fb867f56 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -168,6 +168,16 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \ docker-php-ext-install zip \ ;fi +########################################################################### +# pcntl +########################################################################### + +ARG INSTALL_PCNTL=false +RUN if [ ${INSTALL_PCNTL} = true]; then \ + # Installs pcntl, helpful for running Horizon + docker-php-ext-install pcntl \ +;fi + ########################################################################### # bcmath: ########################################################################### diff --git a/php-worker/Dockerfile b/php-worker/Dockerfile index a157b021..158a1664 100644 --- a/php-worker/Dockerfile +++ b/php-worker/Dockerfile @@ -22,7 +22,7 @@ RUN apk --update add wget \ libgsasl-dev \ supervisor -RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml +RUN docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl RUN pecl channel-update pecl.php.net && pecl install memcached mcrypt-1.0.1 && docker-php-ext-enable memcached # Install PostgreSQL drivers: From d142500216516ffc45e4ad33f62353d1975cc565 Mon Sep 17 00:00:00 2001 From: Pavel Mironchik Date: Fri, 27 Apr 2018 21:48:16 +0600 Subject: [PATCH 05/20] Remove unused variable PHP_FPM_INSTALL_POSTGRES. --- env-example | 1 - 1 file changed, 1 deletion(-) diff --git a/env-example b/env-example index 87f4cefe..ed7a7054 100644 --- a/env-example +++ b/env-example @@ -133,7 +133,6 @@ PHP_FPM_INSTALL_GMP=false PHP_FPM_INSTALL_EXIF=false PHP_FPM_INSTALL_AEROSPIKE=false PHP_FPM_INSTALL_PGSQL=false -PHP_FPM_INSTALL_POSTGRES=false PHP_FPM_INSTALL_GHOSTSCRIPT=false PHP_FPM_INSTALL_LDAP=false PHP_FPM_INSTALL_SWOOLE=false From dac336e6a144813059a19d49af3fbf2e95824afa Mon Sep 17 00:00:00 2001 From: Fernado Pinheiro Date: Wed, 2 May 2018 10:49:19 -0300 Subject: [PATCH 06/20] fix: Fix Drush install for the workspace --- workspace/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 66374198..478f060a 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -302,10 +302,12 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \ USER root ARG INSTALL_DRUSH=false +ARG DRUSH_VERSION=${DRUSH_VERSION} RUN if [ ${INSTALL_DRUSH} = true ]; then \ + apt-get update -yqq && \ apt-get -y install mysql-client && \ - # Install Drush 8 with the phar file. + # Install Drush with the phar file. curl -fsSL -o /usr/local/bin/drush https://github.com/drush-ops/drush/releases/download/${DRUSH_VERSION}/drush.phar | bash && \ chmod +x /usr/local/bin/drush && \ drush core-status \ @@ -320,6 +322,7 @@ USER root ARG INSTALL_DRUPAL_CONSOLE=false RUN if [ ${INSTALL_DRUPAL_CONSOLE} = true ]; then \ + apt-get update -yqq && \ apt-get -y install mysql-client && \ curl https://drupalconsole.com/installer -L -o drupal.phar && \ mv drupal.phar /usr/local/bin/drupal && \ From 77bea30cb0aa24be581b87d2ebee683ca80a55b0 Mon Sep 17 00:00:00 2001 From: Johan Eliasson Date: Fri, 4 May 2018 22:04:35 +0200 Subject: [PATCH 07/20] Update apt sources before installing imagemagick #1512 --- workspace/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 66374198..09d4c758 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -654,6 +654,7 @@ USER root ARG INSTALL_IMAGEMAGICK=false RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ + apt-get update && \ apt-get install -y --force-yes imagemagick php-imagick \ ;fi From 9e5fdda294dc5785502b1eba30710497862c414c Mon Sep 17 00:00:00 2001 From: SDLyu Date: Sat, 5 May 2018 22:06:15 +0800 Subject: [PATCH 08/20] Update env-example --- env-example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env-example b/env-example index 87f4cefe..ec5562f3 100644 --- a/env-example +++ b/env-example @@ -31,7 +31,7 @@ COMPOSE_PATH_SEPARATOR=: ### PHP Version ########################################### -# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.2 - 7.1 - 7.0 - 5.6 - 5.5 +# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.2 - 7.1 - 7.0 - 5.6 PHP_VERSION=7.2 ### PHP Interpreter ####################################### From b990af33536bc874a0cf5f3202d850936528a0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Grzegorz=20D=C4=85browski?= Date: Mon, 7 May 2018 10:58:55 +0200 Subject: [PATCH 09/20] Add subversion support in workspace --- docker-compose.yml | 1 + env-example | 1 + workspace/Dockerfile | 13 +++++++++++++ 3 files changed, 15 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 66c4f6e1..a72541ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,6 +48,7 @@ services: context: ./workspace args: - PHP_VERSION=${PHP_VERSION} + - INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION} - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG} - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE} - INSTALL_SOAP=${WORKSPACE_INSTALL_SOAP} diff --git a/env-example b/env-example index 87f4cefe..cc9d9be7 100644 --- a/env-example +++ b/env-example @@ -80,6 +80,7 @@ WORKSPACE_INSTALL_YARN=true WORKSPACE_YARN_VERSION=latest WORKSPACE_INSTALL_PHPREDIS=true WORKSPACE_INSTALL_WORKSPACE_SSH=false +WORKSPACE_INSTALL_SUBVERSION=false WORKSPACE_INSTALL_XDEBUG=false WORKSPACE_INSTALL_LDAP=false WORKSPACE_INSTALL_SOAP=false diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 66374198..73e66a3b 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -182,6 +182,19 @@ RUN if [ ${INSTALL_IMAP} = true ]; then \ apt-get install -y php${PHP_VERSION}-imap \ ;fi +########################################################################### +# Subversion: +########################################################################### + +USER root + +ARG INSTALL_SUBVERSION=false + +RUN if [ ${INSTALL_SUBVERSION} = true ]; then \ + apt-get install -y subversion \ +;fi + + ########################################################################### # xDebug: ########################################################################### From f6f37ec0202bba46ed44333fe8e70afe5ba65bc8 Mon Sep 17 00:00:00 2001 From: "D.J. Marcolesco" Date: Fri, 25 May 2018 10:01:35 -0500 Subject: [PATCH 10/20] Update index.md Add information for Windows hosts when adding custom cron jobs --- DOCUMENTATION/content/documentation/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index dabde4f0..36dfff14 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1058,6 +1058,8 @@ You can add your cron jobs to `workspace/crontab/root` after the `php artisan` l Make sure you [change the timezone](#Change-the-timezone) if you don't want to use the default (UTC). +If you are on Windows, be sure that the line endings for this file are LF only, or the cron jobs will silently fail. + From 890faa2f3c0ffc15bf23ec50bd52937900a42bdf Mon Sep 17 00:00:00 2001 From: "D.J. Marcolesco" Date: Fri, 25 May 2018 10:04:59 -0500 Subject: [PATCH 11/20] Update index.md Improve working --- DOCUMENTATION/content/documentation/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 36dfff14..adb6b98c 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1058,7 +1058,7 @@ You can add your cron jobs to `workspace/crontab/root` after the `php artisan` l Make sure you [change the timezone](#Change-the-timezone) if you don't want to use the default (UTC). -If you are on Windows, be sure that the line endings for this file are LF only, or the cron jobs will silently fail. +If you are on Windows, verify that the line endings for this file are LF only, otherwise the cron jobs will silently fail. From 97adef735ad973497e56c85b12d32438b6377126 Mon Sep 17 00:00:00 2001 From: bestlong Date: Sat, 26 May 2018 07:32:33 +0800 Subject: [PATCH 12/20] fix #1535 xdebug installation fails when php version is 5.6 --- php-fpm/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index c062f424..afd24a43 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -85,9 +85,13 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \ ARG INSTALL_XDEBUG=false RUN if [ ${INSTALL_XDEBUG} = true ]; then \ - # Install the xdebug extension - pecl install xdebug && \ - docker-php-ext-enable xdebug \ + # Install the xdebug extension + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install xdebug-2.5.5; \ + else \ + pecl install xdebug; \ + fi && \ + docker-php-ext-enable xdebug \ ;fi # Copy xdebug configuration for remote debugging From d1170f51c8a4a3ad0ba35d9668f19149c739bcc2 Mon Sep 17 00:00:00 2001 From: bestlong Date: Sat, 26 May 2018 07:47:29 +0800 Subject: [PATCH 13/20] Fix install php ext SOAP No package php-soap available --- php-fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index afd24a43..02725b94 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -48,6 +48,7 @@ ARG INSTALL_SOAP=false RUN if [ ${INSTALL_SOAP} = true ]; then \ # Install the soap extension + rm /etc/apt/preferences.d/no-debian-php && \ apt-get update -yqq && \ apt-get -y install libxml2-dev php-soap && \ docker-php-ext-install soap \ From 808bd72d13b006963be8441e3894ecfebe290c1b Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sun, 27 May 2018 10:06:00 +0800 Subject: [PATCH 14/20] Fix #1544, Unable to locate package libgmp-dev. (#1569) * Fix #1544, Unable to locate package libgmp-dev. --- php-fpm/Dockerfile | 5 +++-- workspace/Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 02725b94..096be5e3 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -18,6 +18,9 @@ FROM laradock/php-fpm:2.2-${PHP_VERSION} LABEL maintainer="Mahmoud Zalt " +# always run apt update when start and after add new source list, then clean up at end. +RUN apt-get update -yqq + # #-------------------------------------------------------------------------- # Mandatory Software's Installation @@ -49,7 +52,6 @@ ARG INSTALL_SOAP=false RUN if [ ${INSTALL_SOAP} = true ]; then \ # Install the soap extension rm /etc/apt/preferences.d/no-debian-php && \ - apt-get update -yqq && \ apt-get -y install libxml2-dev php-soap && \ docker-php-ext-install soap \ ;fi @@ -296,7 +298,6 @@ ARG INSTALL_INTL=false RUN if [ ${INSTALL_INTL} = true ]; then \ # Install intl and requirements - apt-get update -yqq && \ apt-get install -y zlib1g-dev libicu-dev g++ && \ docker-php-ext-configure intl && \ docker-php-ext-install intl \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index edd42da6..fdc3c2ef 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -31,7 +31,9 @@ ENV PUID ${PUID} ARG PGID=1000 ENV PGID ${PGID} -RUN groupadd -g ${PGID} laradock && \ +# always run apt update when start and after add new source list, then clean up at end. +RUN apt-get update -yqq && \ + groupadd -g ${PGID} laradock && \ useradd -u ${PUID} -g laradock -m laradock -G docker_env && \ usermod -p "*" laradock @@ -667,7 +669,6 @@ USER root ARG INSTALL_IMAGEMAGICK=false RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get update && \ apt-get install -y --force-yes imagemagick php-imagick \ ;fi From 62b716f469d99a1d554c8c4a0f81cfa99d3c5eb8 Mon Sep 17 00:00:00 2001 From: bestlong Date: Sun, 27 May 2018 11:21:22 +0800 Subject: [PATCH 15/20] fix Getting Started step "docker-compose up -d nginx mysql" missing workspace container. --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index a72541ba..eca0a6e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,6 +144,8 @@ services: - "dockerhost:${DOCKER_HOST_IP}" environment: - PHP_IDE_CONFIG=${PHP_IDE_CONFIG} + depends_on: + - workspace networks: - backend From 69de0668e9dd815ebf2bf3a7dc525e168e9a23cb Mon Sep 17 00:00:00 2001 From: Luciano Jr Date: Sun, 27 May 2018 10:39:41 +0100 Subject: [PATCH 16/20] Add portainer --- docker-compose.yml | 11 +++++++++++ portainer/Dockerfile | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 portainer/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index eca0a6e9..c3cf9f00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -697,3 +697,14 @@ services: depends_on: - workspace tty: true + +### Portainer ################################################ + portainer: + build: + context: ./portainer + volumes: + - ${DATA_PATH_HOST}/portainer_data:/data + - /var/run/docker.sock:/var/run/docker.sock + ports: + - 9010:9000 + diff --git a/portainer/Dockerfile b/portainer/Dockerfile new file mode 100644 index 00000000..c044f0d8 --- /dev/null +++ b/portainer/Dockerfile @@ -0,0 +1,3 @@ +FROM portainer/portainer + +LABEL maintainer="luciano@lucianojr.com.br" From 51d253db2184ac13a330532bba1934fa6e6721ce Mon Sep 17 00:00:00 2001 From: Luciano Jr Date: Sun, 27 May 2018 11:22:49 +0100 Subject: [PATCH 17/20] Update documentation adding Portainer section --- DOCUMENTATION/content/documentation/index.md | 15 +++++++++++++++ DOCUMENTATION/content/introduction/index.md | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index 30336072..160e6886 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -754,6 +754,21 @@ docker-compose up -d adminer +
+ +## Use Portainer + +1 - Run the Portainer Container (`portainer`) with the `docker-compose up` command. Example: + +```bash +docker-compose up -d portainer +``` + +2 - Open your browser and visit the localhost on port **9010**: `http://localhost:9010` + + + +
diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md index bff7fef5..8a957d92 100644 --- a/DOCUMENTATION/content/introduction/index.md +++ b/DOCUMENTATION/content/introduction/index.md @@ -97,7 +97,7 @@ Beanstalkd - RabbitMQ - PHP Worker - **Queueing Management:** Beanstalkd Console - RabbitMQ Console - **Random Tools:** -HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Grafana - Mailhog - MailDev - Minio - Varnish - Swoole - Laravel Echo... +HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Grafana - Mailhog - MailDev - Minio - Varnish - Swoole - Portainer - Laravel Echo... Laradock introduces the **Workspace** Image, as a development environment. It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose. From 9250326664f002ed155819cd8a765916ed5b23a7 Mon Sep 17 00:00:00 2001 From: "Shao Yu-Lung (Allen)" Date: Sun, 27 May 2018 19:47:13 +0800 Subject: [PATCH 18/20] Swoole support php5 (#1571) * php5 fpm support swoole * php5 workspace support swoole --- php-fpm/Dockerfile | 8 ++++++-- workspace/Dockerfile | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 62d02c10..3fa164ab 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -135,8 +135,12 @@ ARG INSTALL_SWOOLE=false RUN if [ ${INSTALL_SWOOLE} = true ]; then \ # Install Php Swoole Extension - pecl install swoole \ - && docker-php-ext-enable swoole \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl install swoole-2.0.11; \ + else \ + pecl install swoole; \ + fi && \ + docker-php-ext-enable swoole \ ;fi ########################################################################### diff --git a/workspace/Dockerfile b/workspace/Dockerfile index fdc3c2ef..d468965a 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -305,7 +305,11 @@ ARG PHP_VERSION=${PHP_VERSION} RUN if [ ${INSTALL_SWOOLE} = true ]; then \ # Install Php Swoole Extension - pecl -q install swoole && \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + pecl -q install swoole-2.0.11; \ + else \ + pecl -q install swoole; \ + fi && \ echo "extension=swoole.so" >> /etc/php/${PHP_VERSION}/mods-available/swoole.ini && \ ln -s /etc/php/${PHP_VERSION}/mods-available/swoole.ini /etc/php/${PHP_VERSION}/cli/conf.d/20-swoole.ini \ ;fi From 402383e7b70c4edf6db3e635fe28521317bcdc1d Mon Sep 17 00:00:00 2001 From: bestlong Date: Sun, 27 May 2018 20:01:29 +0800 Subject: [PATCH 19/20] Fix php5 Unable to locate gmp.h --- php-fpm/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 3fa164ab..e67d98db 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -208,7 +208,10 @@ ARG INSTALL_GMP=false RUN if [ ${INSTALL_GMP} = true ]; then \ # Install the GMP extension - apt-get install -y libgmp-dev && \ + apt-get install -y libgmp-dev && \ + if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ + ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h \ + ;fi && \ docker-php-ext-install gmp \ ;fi From d5efd5309eb559fa3eb3915d32ed2d6ccb37b8ff Mon Sep 17 00:00:00 2001 From: bestlong Date: Mon, 28 May 2018 08:47:22 +0800 Subject: [PATCH 20/20] update pecl channel --- php-fpm/Dockerfile | 3 ++- workspace/Dockerfile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index e67d98db..6d4a3b33 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -19,7 +19,8 @@ FROM laradock/php-fpm:2.2-${PHP_VERSION} LABEL maintainer="Mahmoud Zalt " # always run apt update when start and after add new source list, then clean up at end. -RUN apt-get update -yqq +RUN apt-get update -yqq && \ + pecl channel-update pecl.php.net # #-------------------------------------------------------------------------- diff --git a/workspace/Dockerfile b/workspace/Dockerfile index d468965a..428884f7 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -33,6 +33,7 @@ ENV PGID ${PGID} # always run apt update when start and after add new source list, then clean up at end. RUN apt-get update -yqq && \ + pecl channel-update pecl.php.net && \ groupadd -g ${PGID} laradock && \ useradd -u ${PUID} -g laradock -m laradock -G docker_env && \ usermod -p "*" laradock