Merge branch 'release/1.2.19'

nystudio107 · Aug 3, 2021 · 9256072 · 9256072
2 parents 153fc06 + 90e47c0
commit 9256072
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git 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`

diff --git 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
@@ -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"
diff --git 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 \

diff --git 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)
@@ -29,7 +29,7 @@ RUN set -eux; \
         fcgi \
         freetype-dev \
         gettext-dev \
-        gnu-libiconv=1.15-r3 \
+        gnu-libiconv \
         icu-dev \
         imagemagick \
         imagemagick-dev \