From bf520ebcb2b26e76718fa4753929ef4b9e97f1e2 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 26 Nov 2023 17:28:25 -0500 Subject: [PATCH 1/4] refactor: Add openssl --- php-prod-base/php-8.1-alpine/Dockerfile | 1 + php-prod-base/php-8.2-alpine/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/php-prod-base/php-8.1-alpine/Dockerfile b/php-prod-base/php-8.1-alpine/Dockerfile index 2e6b83f..0080656 100755 --- a/php-prod-base/php-8.1-alpine/Dockerfile +++ b/php-prod-base/php-8.1-alpine/Dockerfile @@ -16,6 +16,7 @@ ENV PHPIZE_DEPS \ zlib-dev \ libtool \ linux-headers \ + openssl \ wget # Install packages diff --git a/php-prod-base/php-8.2-alpine/Dockerfile b/php-prod-base/php-8.2-alpine/Dockerfile index 10a5100..08bc266 100755 --- a/php-prod-base/php-8.2-alpine/Dockerfile +++ b/php-prod-base/php-8.2-alpine/Dockerfile @@ -16,6 +16,7 @@ ENV PHPIZE_DEPS \ zlib-dev \ libtool \ linux-headers \ + openssl \ wget # Install packages From e35b1633788e455f30de08187dfff6a9d6dc64cd Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 26 Nov 2023 17:29:34 -0500 Subject: [PATCH 2/4] refactor: Add `libopenssl-dev` --- php-prod-base/php-8.1-alpine/Dockerfile | 2 +- php-prod-base/php-8.2-alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php-prod-base/php-8.1-alpine/Dockerfile b/php-prod-base/php-8.1-alpine/Dockerfile index 0080656..740b0cd 100755 --- a/php-prod-base/php-8.1-alpine/Dockerfile +++ b/php-prod-base/php-8.1-alpine/Dockerfile @@ -16,7 +16,6 @@ ENV PHPIZE_DEPS \ zlib-dev \ libtool \ linux-headers \ - openssl \ wget # Install packages @@ -37,6 +36,7 @@ RUN set -eux; \ icu-data-full \ imagemagick-dev \ jpeg-dev \ + libopenssl-dev \ libpng-dev \ libwebp-dev \ libzip-dev \ diff --git a/php-prod-base/php-8.2-alpine/Dockerfile b/php-prod-base/php-8.2-alpine/Dockerfile index 08bc266..77c0123 100755 --- a/php-prod-base/php-8.2-alpine/Dockerfile +++ b/php-prod-base/php-8.2-alpine/Dockerfile @@ -16,7 +16,6 @@ ENV PHPIZE_DEPS \ zlib-dev \ libtool \ linux-headers \ - openssl \ wget # Install packages @@ -37,6 +36,7 @@ RUN set -eux; \ icu-data-full \ imagemagick-dev \ jpeg-dev \ + libopenssl-dev \ libpng-dev \ libwebp-dev \ libzip-dev \ From 78d4be1e639c5c037f1897baf2e16bf84063d4f1 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 26 Nov 2023 17:31:36 -0500 Subject: [PATCH 3/4] refactor: Fix to `libssl-dev` --- php-prod-base/php-8.1-alpine/Dockerfile | 2 +- php-prod-base/php-8.2-alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php-prod-base/php-8.1-alpine/Dockerfile b/php-prod-base/php-8.1-alpine/Dockerfile index 740b0cd..80e9b89 100755 --- a/php-prod-base/php-8.1-alpine/Dockerfile +++ b/php-prod-base/php-8.1-alpine/Dockerfile @@ -36,7 +36,6 @@ RUN set -eux; \ icu-data-full \ imagemagick-dev \ jpeg-dev \ - libopenssl-dev \ libpng-dev \ libwebp-dev \ libzip-dev \ @@ -44,6 +43,7 @@ RUN set -eux; \ libxml2-dev \ libzip-dev \ oniguruma-dev \ + openssl-dev \ unzip \ && \ # pecl PHP extensions diff --git a/php-prod-base/php-8.2-alpine/Dockerfile b/php-prod-base/php-8.2-alpine/Dockerfile index 77c0123..612deba 100755 --- a/php-prod-base/php-8.2-alpine/Dockerfile +++ b/php-prod-base/php-8.2-alpine/Dockerfile @@ -36,7 +36,6 @@ RUN set -eux; \ icu-data-full \ imagemagick-dev \ jpeg-dev \ - libopenssl-dev \ libpng-dev \ libwebp-dev \ libzip-dev \ @@ -44,6 +43,7 @@ RUN set -eux; \ libxml2-dev \ libzip-dev \ oniguruma-dev \ + openssl-dev \ unzip \ && \ # pecl PHP extensions From 79356c1f617d4731452ffa327909ff682dbe8713 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sun, 26 Nov 2023 18:03:54 -0500 Subject: [PATCH 4/4] chore: Version 1.2.24 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 065a063..a116ec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/docker-images Change Log +## 1.2.24 - 2023.11.26 +### Changed +* Removed `libressl` in favor of `openssl` to allow Postgres to work + ## 1.2.23 - 2023.10.05 ### Added * Switch `php-prod-base:8.2-alpine` from Alpine `3.17` to `3.18`