Skip to content
Snippets Groups Projects
Commit d3bc589d authored by jurgenhaas's avatar jurgenhaas
Browse files

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

parent 1aa0d0e0
No related branches found
Tags v1.7.3
No related merge requests found
Pipeline #18567 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
Dockerfile
+ 2
− 3
View file @ d3bc589d
...@@ -85,8 +85,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \ ...@@ -85,8 +85,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
apk add --no-cache \ apk add --no-cache \
php7 php7-phar php7-json php7-dom php7-gd php7-mbstring php7-openssl \ 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-pdo php7-curl php7-xml php7-zip php7-session php7-ctype php7-iconv \
php7-bcmath \ php7-bcmath && \
gnu-libiconv && \
if [ "${PHP_VERSION}" = "7.0" ]; then \ if [ "${PHP_VERSION}" = "7.0" ]; then \
echo "no extra packages required" ; \ echo "no extra packages required" ; \
else \ else \
...@@ -96,7 +95,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \ ...@@ -96,7 +95,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
apk add --no-cache php7-sodium ; \ apk add --no-cache php7-sodium ; \
fi && \ fi && \
if [ "${PHP_VERSION}" = "7.3" ]; then \ if [ "${PHP_VERSION}" = "7.3" ]; then \
apk add --no-cache php7-sodium ; \ apk add --no-cache php7-sodium gnu-libiconv ; \
fi && \ fi && \
rm /etc/apk/repositories && \ rm /etc/apk/repositories && \
mv /etc/apk/repositories.org /etc/apk/repositories && \ mv /etc/apk/repositories.org /etc/apk/repositories && \
......
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