From 642a2f5dd3a3a55decb5bf03fcc66341a01b02a4 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 20 Dec 2018 17:06:08 +0100
Subject: [PATCH] Add g++ and php7-iconv
---
php-7.0/Dockerfile | 4 ++--
php-7.1/Dockerfile | 4 ++--
php-7.2/Dockerfile | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/php-7.0/Dockerfile b/php-7.0/Dockerfile
index 68cc31c..b4ee0c8 100644
--- a/php-7.0/Dockerfile
+++ b/php-7.0/Dockerfile
@@ -67,10 +67,10 @@ RUN mkdir -p /root/.ssh && \
echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
\
apk update && \
- apk add --no-cache curl openssl openssh ca-certificates wget make patch \
+ apk add --no-cache curl openssl openssh ca-certificates wget make patch g++ \
bash fish python nodejs git unzip \
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-pdo php7-curl php7-xml php7-zip php7-session php7-ctype php7-iconv && \
\
sed -i -e 's/memory_limit = 128M/memory_limit = -1/g' /etc/php7/php.ini && \
\
diff --git a/php-7.1/Dockerfile b/php-7.1/Dockerfile
index aec3844..56f84f6 100644
--- a/php-7.1/Dockerfile
+++ b/php-7.1/Dockerfile
@@ -62,10 +62,10 @@ RUN mkdir -p /root/.ssh && \
echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
\
apk update && \
- apk add --no-cache curl openssl openssh ca-certificates wget make patch \
+ apk add --no-cache curl openssl openssh ca-certificates wget make patch g++ \
bash fish python nodejs git unzip \
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-pdo php7-curl php7-xml php7-zip php7-session php7-ctype php7-iconv \
php7-tokenizer php7-simplexml php7-xmlwriter && \
\
sed -i -e 's/memory_limit = 128M/memory_limit = -1/g' /etc/php7/php.ini && \
diff --git a/php-7.2/Dockerfile b/php-7.2/Dockerfile
index 2a28ff5..f9c25b1 100644
--- a/php-7.2/Dockerfile
+++ b/php-7.2/Dockerfile
@@ -62,10 +62,10 @@ RUN mkdir -p /root/.ssh && \
echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
\
apk update && \
- apk add --no-cache curl openssl openssh ca-certificates wget make patch \
+ apk add --no-cache curl openssl openssh ca-certificates wget make patch g++ \
bash fish python nodejs npm git unzip \
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-pdo php7-curl php7-xml php7-zip php7-session php7-ctype php7-iconv \
php7-tokenizer php7-simplexml php7-xmlwriter && \
\
sed -i -e 's/memory_limit = 128M/memory_limit = -1/g' /etc/php7/php.ini && \
--
GitLab