From 5ce56b7114d1a66ed7b8bc0ad43d20f467d09959 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 15 Oct 2020 14:59:49 +0200
Subject: [PATCH] docker/l3d#46 Install gnu-libiconv only for PHP 7.3 or higher
---
Dockerfile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d0b9e8d..6339e84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,13 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
\
apk update && \
- apk add --no-cache mdocml-apropos openssh wget make patch bash fish python3 git git-lfs unzip acl libpng-dev libzip-dev gnu-libiconv && \
+ apk add --no-cache mdocml-apropos openssh wget make patch bash fish python3 git git-lfs unzip acl libpng-dev libzip-dev && \
+ if [ "${PHP_VERSION}" = "7.3" ]; then \
+ apk add --no-cache gnu-libiconv ; \
+ fi && \
+ if [ "${PHP_VERSION}" = "7.4" ]; then \
+ apk add --no-cache gnu-libiconv ; \
+ fi && \
\
wget -q https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -O /etc/apk/keys/sgerrand.rsa.pub && \
wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${glibc_version}/glibc-${glibc_version}.apk && \
--
GitLab