From f2af78ecac4ed11ab891b7dc0b79912bd541eec6 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Fri, 12 Mar 2021 15:01:44 +0100 Subject: [PATCH 1/8] Update Dockerfile --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 2d8d67ef..62da5562 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -688,7 +688,7 @@ ARG IMAGEMAGICK_VERSION=latest ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y libmagickwand-dev imagemagick && \ + apt-get update -yqq && apt-get install -y libmagickwand-dev imagemagick && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ apt-get install -y git && \ cd /tmp && \ From 615c80f25b7ac472296c5cc7c3a38f67edf009e2 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 12:51:20 +0100 Subject: [PATCH 2/8] Update to solve the xdebug port. Issue: https://github.com/laradock/laradock/issues/2892 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e3a247c2..61d015ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -276,7 +276,7 @@ services: - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG} - docker-in-docker:/certs/client ports: - - "9003:9003" + - "${PHP_FPM_XDEBUG_PORT}:9003" expose: - "9000" extra_hosts: From 18e5ade8956f63ed40384e590bdd3ca814ef3e53 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 12:52:15 +0100 Subject: [PATCH 3/8] Update to solve the xdebug port. Issue: https://github.com/laradock/laradock/issues/2892 --- env-example | 1 + 1 file changed, 1 insertion(+) diff --git a/env-example b/env-example index aebc0b6e..f2d69808 100644 --- a/env-example +++ b/env-example @@ -259,6 +259,7 @@ PHP_FPM_AUDIOWAVEFORM=false PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" PHP_FPM_INSTALL_DOCKER_CLIENT=false PHP_FPM_DEFAULT_LOCALE=POSIX +PHP_FPM_XDEBUG_PORT=9003 PHP_FPM_PUID=1000 PHP_FPM_PGID=1000 From 6c96f29194d211e1904634007fca0dbcadb4786d Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 13:51:41 +0100 Subject: [PATCH 4/8] Revert "Update Dockerfile" This reverts commit f2af78ecac4ed11ab891b7dc0b79912bd541eec6. --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 62da5562..2d8d67ef 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -688,7 +688,7 @@ ARG IMAGEMAGICK_VERSION=latest ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get update -yqq && apt-get install -y libmagickwand-dev imagemagick && \ + apt-get install -y libmagickwand-dev imagemagick && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ apt-get install -y git && \ cd /tmp && \ From cad60947c0198dc68f9e9650342054641f512578 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 13:56:10 +0100 Subject: [PATCH 5/8] Updatee --- env-example | 1 - php-fpm/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/env-example b/env-example index f2d69808..aebc0b6e 100644 --- a/env-example +++ b/env-example @@ -259,7 +259,6 @@ PHP_FPM_AUDIOWAVEFORM=false PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" PHP_FPM_INSTALL_DOCKER_CLIENT=false PHP_FPM_DEFAULT_LOCALE=POSIX -PHP_FPM_XDEBUG_PORT=9003 PHP_FPM_PUID=1000 PHP_FPM_PGID=1000 diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 2d8d67ef..62da5562 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -688,7 +688,7 @@ ARG IMAGEMAGICK_VERSION=latest ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get install -y libmagickwand-dev imagemagick && \ + apt-get update -yqq && apt-get install -y libmagickwand-dev imagemagick && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ apt-get install -y git && \ cd /tmp && \ From f1f416023a74125e24bcee57a0ec1665faefc8fd Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 13:58:04 +0100 Subject: [PATCH 6/8] Revert "Update to solve the xdebug port. Issue: https://github.com/laradock/laradock/issues/2892" This reverts commit 615c80f25b7ac472296c5cc7c3a38f67edf009e2. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 61d015ce..e3a247c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -276,7 +276,7 @@ services: - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG} - docker-in-docker:/certs/client ports: - - "${PHP_FPM_XDEBUG_PORT}:9003" + - "9003:9003" expose: - "9000" extra_hosts: From cca7cef1ceb03e00c16fc63b046e59918374a3df Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 14:10:54 +0100 Subject: [PATCH 7/8] Revert "Update Dockerfile" This reverts commit f2af78ecac4ed11ab891b7dc0b79912bd541eec6. --- php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 62da5562..2d8d67ef 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -688,7 +688,7 @@ ARG IMAGEMAGICK_VERSION=latest ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ - apt-get update -yqq && apt-get install -y libmagickwand-dev imagemagick && \ + apt-get install -y libmagickwand-dev imagemagick && \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ apt-get install -y git && \ cd /tmp && \ From 8d42d86270c49a9b84ddb495fa9eb9822cdd03d0 Mon Sep 17 00:00:00 2001 From: Valentino Lauciani Date: Thu, 18 Mar 2021 14:14:12 +0100 Subject: [PATCH 8/8] Update to solve the xdebug port problem. Issue: #2892 --- docker-compose.yml | 2 +- env-example | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e3a247c2..61d015ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -276,7 +276,7 @@ services: - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG} - docker-in-docker:/certs/client ports: - - "9003:9003" + - "${PHP_FPM_XDEBUG_PORT}:9003" expose: - "9000" extra_hosts: diff --git a/env-example b/env-example index aebc0b6e..f2d69808 100644 --- a/env-example +++ b/env-example @@ -259,6 +259,7 @@ PHP_FPM_AUDIOWAVEFORM=false PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8" PHP_FPM_INSTALL_DOCKER_CLIENT=false PHP_FPM_DEFAULT_LOCALE=POSIX +PHP_FPM_XDEBUG_PORT=9003 PHP_FPM_PUID=1000 PHP_FPM_PGID=1000