Merge branch '8.2'

PHOENIX-MEDIA · Mar 2, 2023 · 8427e0c · 8427e0c
2 parents 1e7f2a1 + fec75ce
commit 8427e0c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,6 +10,10 @@ ENV RELAYHOST_PASSWORD=
 # (optional) Should the postfix relay use TLS
 ENV SMTP_USE_TLS=
 
+# Fixes an bug with iconv @see https://github.com/docker-library/php/issues/240
+RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ gnu-libiconv==1.15-r3
+ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
+
 RUN apk --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ add \
         ca-certificates \
         gettext \