From d3bc589d23ca9a670b2d1ba21f2db39a7765184b Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 22 May 2020 14:41:51 +0200
Subject: [PATCH] Fix iconv() warnings only for PHP 7.3, not 7.2
---
Dockerfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index edd8727..ec422f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,8 +85,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
apk add --no-cache \
php7 php7-phar php7-json php7-dom php7-gd php7-mbstring php7-openssl \
php7-pdo php7-curl php7-xml php7-zip php7-session php7-ctype php7-iconv \
- php7-bcmath \
- gnu-libiconv && \
+ php7-bcmath && \
if [ "${PHP_VERSION}" = "7.0" ]; then \
echo "no extra packages required" ; \
else \
@@ -96,7 +95,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
apk add --no-cache php7-sodium ; \
fi && \
if [ "${PHP_VERSION}" = "7.3" ]; then \
- apk add --no-cache php7-sodium ; \
+ apk add --no-cache php7-sodium gnu-libiconv ; \
fi && \
rm /etc/apk/repositories && \
mv /etc/apk/repositories.org /etc/apk/repositories && \
--
GitLab