From 58c7e8aadcad210f333ff47be63c6a6b701240ba Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 2 Aug 2021 18:39:46 -0400 Subject: [PATCH 1/5] Add trigger-based profiling Signed-off-by: Andrew Welch --- php-dev-base/php-7.4-alpine/xdebug.ini | 3 +++ php-dev-base/php-8.0-alpine/xdebug.ini | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/php-dev-base/php-7.4-alpine/xdebug.ini b/php-dev-base/php-7.4-alpine/xdebug.ini index 99fd3be..42dc0ef 100644 --- a/php-dev-base/php-7.4-alpine/xdebug.ini +++ b/php-dev-base/php-7.4-alpine/xdebug.ini @@ -4,3 +4,6 @@ xdebug.remote_port=9003 xdebug.remote_handler=dbgp xdebug.remote_host=host.docker.internal xdebug.remote_autostart=1 +xdebug.profiler_enable = 0; +xdebug.profiler_enable_trigger = 1; +xdebug.profiler_output_dir = "/var/www/project/cms/storage/logs" diff --git a/php-dev-base/php-8.0-alpine/xdebug.ini b/php-dev-base/php-8.0-alpine/xdebug.ini index c930332..b0a06b3 100644 --- a/php-dev-base/php-8.0-alpine/xdebug.ini +++ b/php-dev-base/php-8.0-alpine/xdebug.ini @@ -1,3 +1,4 @@ -xdebug.mode=debug -xdebug.start_with_request=yes +xdebug.mode=debug,profile +xdebug.start_with_request=trigger xdebug.client_host=host.docker.internal +xdebug.output_dir = "/var/www/project/cms/storage/logs" From 66154e71051ed12f100cfc6c63a7fa613d3031cb Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 2 Aug 2021 21:08:07 -0400 Subject: [PATCH 2/5] Fix upstream issue (https://stackoverflow.com/questions/68013058/alpine3-14-docker-libtls-so-20-conflict) Signed-off-by: Andrew Welch --- php-prod-base/php-7.4-alpine/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/php-prod-base/php-7.4-alpine/Dockerfile b/php-prod-base/php-7.4-alpine/Dockerfile index c0b84d7..b36a1bd 100755 --- a/php-prod-base/php-7.4-alpine/Dockerfile +++ b/php-prod-base/php-7.4-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-fpm-alpine +FROM php:7.4-fpm-alpine3.13 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) @@ -23,13 +23,14 @@ RUN set -eux; \ && \ # Packages to install apk add --no-cache \ + $PHPIZE_DEPS \ bzip2-dev \ ca-certificates \ curl \ fcgi \ freetype-dev \ gettext-dev \ - gnu-libiconv=1.15-r3 \ + gnu-libiconv \ icu-dev \ imagemagick \ imagemagick-dev \ From 36cc7a4a7697e912e87c976163197de05059b186 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 2 Aug 2021 21:11:45 -0400 Subject: [PATCH 3/5] Fix build Signed-off-by: Andrew Welch --- php-prod-base/php-8.0-alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-prod-base/php-8.0-alpine/Dockerfile b/php-prod-base/php-8.0-alpine/Dockerfile index caa9ec5..bd0cf11 100755 --- a/php-prod-base/php-8.0-alpine/Dockerfile +++ b/php-prod-base/php-8.0-alpine/Dockerfile @@ -29,7 +29,7 @@ RUN set -eux; \ fcgi \ freetype-dev \ gettext-dev \ - gnu-libiconv=1.15-r3 \ + gnu-libiconv \ icu-dev \ imagemagick \ imagemagick-dev \ From 1b9bb2fcedc04cf6d1593ee28ce86e436dce0246 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 2 Aug 2021 21:22:26 -0400 Subject: [PATCH 4/5] Fix upstream issue (https://stackoverflow.com/questions/68013058/alpine3-14-docker-libtls-so-20-conflict) Signed-off-by: Andrew Welch --- php-prod-base/php-8.0-alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-prod-base/php-8.0-alpine/Dockerfile b/php-prod-base/php-8.0-alpine/Dockerfile index bd0cf11..1299ad0 100755 --- a/php-prod-base/php-8.0-alpine/Dockerfile +++ b/php-prod-base/php-8.0-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-fpm-alpine +FROM php:8.0-fpm-alpine3.13 # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) From 90e47c01947bee516f348899d4093bc70f9bc677 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 2 Aug 2021 21:31:04 -0400 Subject: [PATCH 5/5] Version 1.2.19 Signed-off-by: Andrew Welch --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c2cee0..a8b9a57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # nystudio107/docker-images Change Log +## 1.2.19 - 2021.08.02 +### Fixed +* Fixed upstream issues with `libressl` by pinning to alpine3.13 (https://stackoverflow.com/questions/68013058/alpine3-14-docker-libtls-so-20-conflict) +* Change from the specific version `gnu-libiconv=1.15-r3` to just `gnu-libiconv` + ## 1.2.18 - 2021.06.26 ### Changed * Continue running the `php-fpm` containers as root (since `php-fpm` uses worker pools with the proper user/group), but switch to `su-exec` to ensure any craft CLI commands are run as `www-data`