From faff334e14e5dbe3b1f6fe29c534335c911c66f7 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 16 Dec 2018 17:19:14 +0100 Subject: [PATCH] Ensure to check against already available reflection module --- Dockerfiles/mods/Dockerfile-5.2 | 2 ++ Dockerfiles/mods/Dockerfile-5.3 | 5 ----- Dockerfiles/mods/Dockerfile-5.4 | 5 ----- Dockerfiles/mods/Dockerfile-5.5 | 5 ----- Dockerfiles/mods/Dockerfile-5.6 | 5 ----- Dockerfiles/mods/Dockerfile-7.0 | 5 ----- Dockerfiles/mods/Dockerfile-7.1 | 5 ----- Dockerfiles/mods/Dockerfile-7.2 | 5 ----- Dockerfiles/mods/Dockerfile-7.3 | 2 ++ Dockerfiles/mods/Dockerfile-7.4 | 2 ++ build/ansible/group_vars/all.yml | 4 +--- 11 files changed, 7 insertions(+), 38 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index df09007..d121fd0 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -484,6 +484,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^recode$' \ && php -m | grep -oiE '^redis$' \ && php-fpm -m | grep -oiE '^redis$' \ + && php -m | grep -oiE '^reflection$' \ + && php-fpm -m | grep -oiE '^reflection$' \ && php -m | grep -oiE '^session$' \ && php-fpm -m | grep -oiE '^session$' \ && php -m | grep -oiE '^shmop$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 6974b35..a70a245 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -310,11 +310,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index a53714e..e0f554d 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -315,11 +315,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 1b13ebb..38e9e61 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -309,11 +309,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 4528890..78bbaec 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -313,11 +313,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index aa0ccba..7f0ddd2 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -311,11 +311,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 2ca5e5d..458f47e 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -306,11 +306,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index bce289a..0daf2a5 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -307,11 +307,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/redis || true) \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ -# ---- Installing PHP Extension: reflection ---- - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) reflection \ - && (rm -rf /usr/local/lib/php/test/reflection || true) \ - && (rm -rf /usr/local/lib/php/doc/reflection || true) \ - \ # ---- Installing PHP Extension: rdkafka ---- && pecl install rdkafka \ && docker-php-ext-enable rdkafka \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 125c014..ff77ec2 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -505,6 +505,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^recode$' \ && php -m | grep -oiE '^redis$' \ && php-fpm -m | grep -oiE '^redis$' \ + && php -m | grep -oiE '^reflection$' \ + && php-fpm -m | grep -oiE '^reflection$' \ && php -m | grep -oiE '^rdkafka$' \ && php-fpm -m | grep -oiE '^rdkafka$' \ && php -m | grep -oiE '^session$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index dbcda9b..3fbac5b 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -480,6 +480,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^recode$' \ && php -m | grep -oiE '^redis$' \ && php-fpm -m | grep -oiE '^redis$' \ + && php -m | grep -oiE '^reflection$' \ + && php-fpm -m | grep -oiE '^reflection$' \ && php -m | grep -oiE '^rdkafka$' \ && php-fpm -m | grep -oiE '^rdkafka$' \ && php -m | grep -oiE '^session$' \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 40f0163..2cd22f4 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1277,9 +1277,7 @@ extensions_available: all: type: pecl reflection: - disabled: [5.2, 7.3, 7.4] - all: - type: builtin + already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4] rdkafka: disabled: [5.2] all: