From 158d974dbb56484d6b6f2345435824e8972cae33 Mon Sep 17 00:00:00 2001 From: Kevin Buchholz Date: Tue, 24 Aug 2021 17:42:38 +0200 Subject: [PATCH 1/2] use 8.0 as php version constraint --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3eb0f30..de5d21b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0.9-fpm-alpine +FROM php:8.0-fpm-alpine ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \ PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \ From 5638cd72d792439f2c775f89cfdab15484bf70ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20M=C3=BCller?= Date: Fri, 17 Sep 2021 15:05:46 +0200 Subject: [PATCH 2/2] Update Dockerfile Use specific libiconv version --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index de5d21b..41fdc5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,9 +58,9 @@ RUN apk info \ && apk del .build-deps \ && rm -rf /tmp/* /var/cache/apk/* -# fix iconv (see https://github.com/docker-library/php/issues/240#issuecomment-305038173) -RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ gnu-libiconv -ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php +# fix iconv (see https://github.com/docker-library/php/issues/240#issuecomment-876464325) +RUN apk add gnu-libiconv=1.15-r3 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ --allow-untrusted +ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so # change default shell SHELL ["/bin/bash", "-c"]