Commit d3bc589d authored by Jürgen Haas's avatar Jürgen Haas

Fix iconv() warnings only for PHP 7.3, not 7.2

parent 1aa0d0e0
Pipeline #18567 passed with stage
in 1 minute and 26 seconds
......@@ -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 && \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment