From d54b748d54c40cb9f8eedee4ce7663370386610a Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 11:11:08 +0100 Subject: [PATCH] Drop comment about libressl package The PR/change mentioned was effectively reversed by https://github.com/docker-library/php/pull/786/, after Alpine decided to move back from libressl to openssl, hence rendering this comment obsolete and possibly confusing. --- 8.1/alpine3.18/cli/Dockerfile | 1 - 8.1/alpine3.18/fpm/Dockerfile | 1 - 8.1/alpine3.18/zts/Dockerfile | 1 - 8.1/alpine3.19/cli/Dockerfile | 1 - 8.1/alpine3.19/fpm/Dockerfile | 1 - 8.1/alpine3.19/zts/Dockerfile | 1 - 8.2/alpine3.18/cli/Dockerfile | 1 - 8.2/alpine3.18/fpm/Dockerfile | 1 - 8.2/alpine3.18/zts/Dockerfile | 1 - 8.2/alpine3.19/cli/Dockerfile | 1 - 8.2/alpine3.19/fpm/Dockerfile | 1 - 8.2/alpine3.19/zts/Dockerfile | 1 - 8.3/alpine3.18/cli/Dockerfile | 1 - 8.3/alpine3.18/fpm/Dockerfile | 1 - 8.3/alpine3.18/zts/Dockerfile | 1 - 8.3/alpine3.19/cli/Dockerfile | 1 - 8.3/alpine3.19/fpm/Dockerfile | 1 - 8.3/alpine3.19/zts/Dockerfile | 1 - Dockerfile-linux.template | 1 - 19 files changed, 19 deletions(-) diff --git a/8.1/alpine3.18/cli/Dockerfile b/8.1/alpine3.18/cli/Dockerfile index 53304bf2b6..f19be86d07 100644 --- a/8.1/alpine3.18/cli/Dockerfile +++ b/8.1/alpine3.18/cli/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.1/alpine3.18/fpm/Dockerfile b/8.1/alpine3.18/fpm/Dockerfile index 8e36343eef..694674c76c 100644 --- a/8.1/alpine3.18/fpm/Dockerfile +++ b/8.1/alpine3.18/fpm/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.1/alpine3.18/zts/Dockerfile b/8.1/alpine3.18/zts/Dockerfile index ed9a750c9b..2e0ba9cc0f 100644 --- a/8.1/alpine3.18/zts/Dockerfile +++ b/8.1/alpine3.18/zts/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.1/alpine3.19/cli/Dockerfile b/8.1/alpine3.19/cli/Dockerfile index 93cccf15cb..adf355be48 100644 --- a/8.1/alpine3.19/cli/Dockerfile +++ b/8.1/alpine3.19/cli/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.1/alpine3.19/fpm/Dockerfile b/8.1/alpine3.19/fpm/Dockerfile index 904e781281..281e09b137 100644 --- a/8.1/alpine3.19/fpm/Dockerfile +++ b/8.1/alpine3.19/fpm/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.1/alpine3.19/zts/Dockerfile b/8.1/alpine3.19/zts/Dockerfile index 4180c27f99..d021e03061 100644 --- a/8.1/alpine3.19/zts/Dockerfile +++ b/8.1/alpine3.19/zts/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.2/alpine3.18/cli/Dockerfile b/8.2/alpine3.18/cli/Dockerfile index 88860c8480..df9e8556ce 100644 --- a/8.2/alpine3.18/cli/Dockerfile +++ b/8.2/alpine3.18/cli/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.2/alpine3.18/fpm/Dockerfile b/8.2/alpine3.18/fpm/Dockerfile index 93f9a85227..5b2a8c6a48 100644 --- a/8.2/alpine3.18/fpm/Dockerfile +++ b/8.2/alpine3.18/fpm/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.2/alpine3.18/zts/Dockerfile b/8.2/alpine3.18/zts/Dockerfile index 0bc8afbd50..c5028a78b1 100644 --- a/8.2/alpine3.18/zts/Dockerfile +++ b/8.2/alpine3.18/zts/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.2/alpine3.19/cli/Dockerfile b/8.2/alpine3.19/cli/Dockerfile index 3d1d10d9a3..cba764e058 100644 --- a/8.2/alpine3.19/cli/Dockerfile +++ b/8.2/alpine3.19/cli/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.2/alpine3.19/fpm/Dockerfile b/8.2/alpine3.19/fpm/Dockerfile index d1a6a63ad1..334afab506 100644 --- a/8.2/alpine3.19/fpm/Dockerfile +++ b/8.2/alpine3.19/fpm/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.2/alpine3.19/zts/Dockerfile b/8.2/alpine3.19/zts/Dockerfile index 232b6a783b..0c1b29d9df 100644 --- a/8.2/alpine3.19/zts/Dockerfile +++ b/8.2/alpine3.19/zts/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.3/alpine3.18/cli/Dockerfile b/8.3/alpine3.18/cli/Dockerfile index bd2d512a93..e22f42814b 100644 --- a/8.3/alpine3.18/cli/Dockerfile +++ b/8.3/alpine3.18/cli/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.3/alpine3.18/fpm/Dockerfile b/8.3/alpine3.18/fpm/Dockerfile index 570216c233..c42270fea4 100644 --- a/8.3/alpine3.18/fpm/Dockerfile +++ b/8.3/alpine3.18/fpm/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.3/alpine3.18/zts/Dockerfile b/8.3/alpine3.18/zts/Dockerfile index 048843fe8a..876462b44d 100644 --- a/8.3/alpine3.18/zts/Dockerfile +++ b/8.3/alpine3.18/zts/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.3/alpine3.19/cli/Dockerfile b/8.3/alpine3.19/cli/Dockerfile index 5f82d1ed0c..3d1ab46552 100644 --- a/8.3/alpine3.19/cli/Dockerfile +++ b/8.3/alpine3.19/cli/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.3/alpine3.19/fpm/Dockerfile b/8.3/alpine3.19/fpm/Dockerfile index 345ffe7a10..e51ace52ee 100644 --- a/8.3/alpine3.19/fpm/Dockerfile +++ b/8.3/alpine3.19/fpm/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/8.3/alpine3.19/zts/Dockerfile b/8.3/alpine3.19/zts/Dockerfile index b4dd2dcf02..6433546d49 100644 --- a/8.3/alpine3.19/zts/Dockerfile +++ b/8.3/alpine3.19/zts/Dockerfile @@ -25,7 +25,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 70b1403367..f0830ef4a7 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -50,7 +50,6 @@ RUN apk add --no-cache \ curl \ tar \ xz \ -# https://github.com/docker-library/php/issues/494 openssl # ensure www-data user exists