From b08c12e6abb10874a94b47b87c5283bac3d5b3f9 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 11 Dec 2018 00:10:20 +0100 Subject: [PATCH] Add zip builddeps for PHP 7.3 --- Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + php7.3/apache/Dockerfile | 1 + php7.3/fpm-alpine/Dockerfile | 1 + php7.3/fpm/Dockerfile | 1 + update.sh | 7 +++++++ 6 files changed, 12 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 2f1de78..d53d61e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -19,6 +19,7 @@ RUN set -ex; \ libmcrypt-dev \ libmemcached-dev \ libpng-dev \ + libzip-dev \ openldap-dev \ pcre-dev \ postgresql-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 924e12a..85c6446 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -18,6 +18,7 @@ RUN set -ex; \ libmemcached-dev \ libpng-dev \ libpq-dev \ + libzip-dev \ ; \ \ docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index 9733a24..096fa3a 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/Dockerfile @@ -20,6 +20,7 @@ RUN set -ex; \ libmemcached-dev \ libpng-dev \ libpq-dev \ + libzip-dev \ ; \ \ docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index 43aa9b4..21a3ff1 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -18,6 +18,7 @@ RUN set -ex; \ libjpeg-turbo-dev \ libmemcached-dev \ libpng-dev \ + libzip-dev \ openldap-dev \ pcre-dev \ postgresql-dev \ diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index c4f6006..79b959e 100644 --- a/php7.3/fpm/Dockerfile +++ b/php7.3/fpm/Dockerfile @@ -17,6 +17,7 @@ RUN set -ex; \ libmemcached-dev \ libpng-dev \ libpq-dev \ + libzip-dev \ ; \ \ docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ diff --git a/update.sh b/update.sh index a778ad3..d01b7c5 100755 --- a/update.sh +++ b/update.sh @@ -77,6 +77,13 @@ for phpVersion in "${phpVersions[@]}"; do -e '/mcrypt/d' \ -i $dir/Dockerfile fi + + if [[ "$phpVersion" != 7.3 ]]; then + sed -ri \ + -e '/libzip-dev/d' \ + "$dir/Dockerfile" + fi + ) travisEnv+='\n - VARIANT='"$dir"