From 3b8aa7062abebcbb2f71ca3e8d4d85030a19b4f9 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 1 Jun 2018 14:00:10 +0200 Subject: [PATCH] Do "pecl install" in series so it fails properly --- 12.0-rc/apache/Dockerfile | 11 ++++++----- 12.0-rc/fpm-alpine/Dockerfile | 11 ++++++----- 12.0-rc/fpm/Dockerfile | 11 ++++++----- 12.0/apache/Dockerfile | 11 ++++++----- 12.0/fpm-alpine/Dockerfile | 11 ++++++----- 12.0/fpm/Dockerfile | 11 ++++++----- 13.0-rc/apache/Dockerfile | 11 ++++++----- 13.0-rc/fpm-alpine/Dockerfile | 11 ++++++----- 13.0-rc/fpm/Dockerfile | 11 ++++++----- 13.0/apache/Dockerfile | 11 ++++++----- 13.0/fpm-alpine/Dockerfile | 11 ++++++----- 13.0/fpm/Dockerfile | 11 ++++++----- Dockerfile-alpine.template | 11 ++++++----- Dockerfile-debian.template | 11 ++++++----- 14 files changed, 84 insertions(+), 70 deletions(-) diff --git a/12.0-rc/apache/Dockerfile b/12.0-rc/apache/Dockerfile index b26eded..78cd3f1 100644 --- a/12.0-rc/apache/Dockerfile +++ b/12.0-rc/apache/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/12.0-rc/fpm-alpine/Dockerfile b/12.0-rc/fpm-alpine/Dockerfile index a0edea2..2831c80 100644 --- a/12.0-rc/fpm-alpine/Dockerfile +++ b/12.0-rc/fpm-alpine/Dockerfile @@ -44,11 +44,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/12.0-rc/fpm/Dockerfile b/12.0-rc/fpm/Dockerfile index 2b67296..de2f31e 100644 --- a/12.0-rc/fpm/Dockerfile +++ b/12.0-rc/fpm/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index e9e059d..bdaf1cc 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile index c75b336..1029d50 100644 --- a/12.0/fpm-alpine/Dockerfile +++ b/12.0/fpm-alpine/Dockerfile @@ -44,11 +44,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index 019b664..486f656 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/13.0-rc/apache/Dockerfile b/13.0-rc/apache/Dockerfile index 4685a24..9d909d4 100644 --- a/13.0-rc/apache/Dockerfile +++ b/13.0-rc/apache/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/13.0-rc/fpm-alpine/Dockerfile b/13.0-rc/fpm-alpine/Dockerfile index 0726284..c90ec1e 100644 --- a/13.0-rc/fpm-alpine/Dockerfile +++ b/13.0-rc/fpm-alpine/Dockerfile @@ -44,11 +44,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/13.0-rc/fpm/Dockerfile b/13.0-rc/fpm/Dockerfile index 12fd39b..a24a3ee 100644 --- a/13.0-rc/fpm/Dockerfile +++ b/13.0-rc/fpm/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile index 8f17353..fd71061 100644 --- a/13.0/apache/Dockerfile +++ b/13.0/apache/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile index 2b75327..1362f57 100644 --- a/13.0/fpm-alpine/Dockerfile +++ b/13.0/fpm-alpine/Dockerfile @@ -44,11 +44,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile index 26a6782..eca7f70 100644 --- a/13.0/fpm/Dockerfile +++ b/13.0/fpm/Dockerfile @@ -50,11 +50,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-5.1.11 \ - memcached-3.0.4 \ - redis-3.1.6 \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-5.1.11; \ + pecl install memcached-3.0.4; \ + pecl install redis-3.1.6; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 05cfc01..392eb42 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -43,11 +43,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-%%APCU_VERSION%% \ - memcached-%%MEMCACHED_VERSION%% \ - redis-%%REDIS_VERSION%% \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-%%APCU_VERSION%%; \ + pecl install memcached-%%MEMCACHED_VERSION%%; \ + pecl install redis-%%REDIS_VERSION%%; \ + \ docker-php-ext-enable \ apcu \ memcached \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index b2e2c7c..ff0785b 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -49,11 +49,12 @@ RUN set -ex; \ pdo_pgsql \ zip \ ; \ - pecl install \ - APCu-%%APCU_VERSION%% \ - memcached-%%MEMCACHED_VERSION%% \ - redis-%%REDIS_VERSION%% \ - ; \ + \ +# pecl will claim success even if one install fails, so we need to perform each install separately + pecl install APCu-%%APCU_VERSION%%; \ + pecl install memcached-%%MEMCACHED_VERSION%%; \ + pecl install redis-%%REDIS_VERSION%%; \ + \ docker-php-ext-enable \ apcu \ memcached \