Skip to content

Commit 6f574de

Browse files
author
Kevin Buchholz
committed
Merge branch 'release/0.19.0'
2 parents 966626a + 6e65164 commit 6f574de

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0.9-fpm-alpine
1+
FROM php:8.0-fpm-alpine
22

33
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
44
PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -58,9 +58,9 @@ RUN apk info \
5858
&& apk del .build-deps \
5959
&& rm -rf /tmp/* /var/cache/apk/*
6060

61-
# fix iconv (see https://github.com/docker-library/php/issues/240#issuecomment-305038173)
62-
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ gnu-libiconv
63-
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
61+
# fix iconv (see https://github.com/docker-library/php/issues/240#issuecomment-876464325)
62+
RUN apk add gnu-libiconv=1.15-r3 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ --allow-untrusted
63+
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so
6464

6565
# change default shell
6666
SHELL ["/bin/bash", "-c"]

0 commit comments

Comments
 (0)