From 04ad135df598f23f5bf70e148603fd1370e32fa8 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 28 Feb 2019 13:35:51 +0100 Subject: [PATCH 1/3] Fix igbinary for PHP 5.3, 5.4, 5.5 and 5.6 --- Dockerfiles/mods/Dockerfile-5.3 | 2 +- Dockerfiles/mods/Dockerfile-5.4 | 2 +- Dockerfiles/mods/Dockerfile-5.5 | 2 +- Dockerfiles/mods/Dockerfile-5.6 | 2 +- build/ansible/group_vars/all.yml | 12 ++++++++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index a670f9a2..24e98033 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -176,7 +176,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/gmp || true) \ \ # ---- Installing PHP Extension: igbinary ---- - && pecl install igbinary \ + && pecl install igbinary-2.0.8 \ && docker-php-ext-enable igbinary \ && (rm -rf /usr/local/lib/php/test/igbinary || true) \ && (rm -rf /usr/local/lib/php/doc/igbinary || true) \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index efbdb09b..68af6517 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -176,7 +176,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/gmp || true) \ \ # ---- Installing PHP Extension: igbinary ---- - && pecl install igbinary \ + && pecl install igbinary-2.0.8 \ && docker-php-ext-enable igbinary \ && (rm -rf /usr/local/lib/php/test/igbinary || true) \ && (rm -rf /usr/local/lib/php/doc/igbinary || true) \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 9f0c7488..f021f6f5 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -171,7 +171,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/gmp || true) \ \ # ---- Installing PHP Extension: igbinary ---- - && pecl install igbinary \ + && pecl install igbinary-2.0.8 \ && docker-php-ext-enable igbinary \ && (rm -rf /usr/local/lib/php/test/igbinary || true) \ && (rm -rf /usr/local/lib/php/doc/igbinary || true) \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 735900ab..8358de9d 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -186,7 +186,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/gmp || true) \ \ # ---- Installing PHP Extension: igbinary ---- - && pecl install igbinary \ + && pecl install igbinary-2.0.8 \ && docker-php-ext-enable igbinary \ && (rm -rf /usr/local/lib/php/test/igbinary || true) \ && (rm -rf /usr/local/lib/php/doc/igbinary || true) \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index c943efd3..f5011e1a 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1016,6 +1016,18 @@ extensions_available: 5.2: type: pecl version: 2.0.7 + 5.3: + type: pecl + version: 2.0.8 + 5.4: + type: pecl + version: 2.0.8 + 5.5: + type: pecl + version: 2.0.8 + 5.6: + type: pecl + version: 2.0.8 all: type: pecl imagick: From 0e813e607027e2fd234707f45e0e8172447a1eff Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 1 Mar 2019 13:03:11 +0100 Subject: [PATCH 2/3] Fix memcache install --- Dockerfiles/mods/Dockerfile-7.0 | 1 + Dockerfiles/mods/Dockerfile-7.1 | 1 + Dockerfiles/mods/Dockerfile-7.2 | 1 + build/ansible/group_vars/all.yml | 3 +++ 4 files changed, 6 insertions(+) diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 03ad543b..d3449c41 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -236,6 +236,7 @@ RUN set -x \ # ---- Installing PHP Extension: memcache ---- && git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ + && git checkout origin/php7 \ && phpize \ && ./configure --with-zlib-dir=/usr \ && make -j$(getconf _NPROCESSORS_ONLN) \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 914ab3a8..b3ad153a 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -236,6 +236,7 @@ RUN set -x \ # ---- Installing PHP Extension: memcache ---- && git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ + && git checkout origin/php7 \ && phpize \ && ./configure --with-zlib-dir=/usr \ && make -j$(getconf _NPROCESSORS_ONLN) \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 937158fb..9a6db9f6 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -237,6 +237,7 @@ RUN set -x \ # ---- Installing PHP Extension: memcache ---- && git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ && cd /tmp/memcache \ + && git checkout origin/php7 \ && phpize \ && ./configure --with-zlib-dir=/usr \ && make -j$(getconf _NPROCESSORS_ONLN) \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index f5011e1a..404b2e54 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1121,14 +1121,17 @@ extensions_available: 7.0: type: git git_url: https://github.com/websupport-sk/pecl-memcache + git_ref: origin/php7 configure: --with-zlib-dir=/usr 7.1: type: git git_url: https://github.com/websupport-sk/pecl-memcache + git_ref: origin/php7 configure: --with-zlib-dir=/usr 7.2: type: git git_url: https://github.com/websupport-sk/pecl-memcache + git_ref: origin/php7 configure: --with-zlib-dir=/usr all: type: pecl From ceabd15ee0119b1f740ceb2bca0a24c19e888157 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 1 Mar 2019 15:04:45 +0100 Subject: [PATCH 3/3] Update pdo_sqlsrv and sqlsrv modules --- Dockerfiles/mods/Dockerfile-7.0 | 4 ++-- Dockerfiles/mods/Dockerfile-7.3 | 4 ++-- build/ansible/group_vars/all.yml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index d3449c41..1a23167b 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -329,7 +329,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \ \ # ---- Installing PHP Extension: pdo_sqlsrv ---- - && pecl install pdo_sqlsrv \ + && pecl install pdo_sqlsrv-5.3.0 \ && docker-php-ext-enable pdo_sqlsrv \ && (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \ && (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \ @@ -393,7 +393,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/sockets || true) \ \ # ---- Installing PHP Extension: sqlsrv ---- - && pecl install sqlsrv \ + && pecl install sqlsrv-5.3.0 \ && docker-php-ext-enable sqlsrv \ && (rm -rf /usr/local/lib/php/test/sqlsrv || true) \ && (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 27690bb0..b4b12423 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -299,7 +299,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \ \ # ---- Installing PHP Extension: pdo_sqlsrv ---- - && pecl install pdo_sqlsrv-5.5.0preview \ + && pecl install pdo_sqlsrv \ && docker-php-ext-enable pdo_sqlsrv \ && (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \ && (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \ @@ -363,7 +363,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/sockets || true) \ \ # ---- Installing PHP Extension: sqlsrv ---- - && pecl install sqlsrv-5.5.0preview \ + && pecl install sqlsrv \ && docker-php-ext-enable sqlsrv \ && (rm -rf /usr/local/lib/php/test/sqlsrv || true) \ && (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 404b2e54..3030b0f8 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1329,9 +1329,9 @@ extensions_available: already_avail: "{{ php_all_versions }}" pdo_sqlsrv: disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0] - 7.3: + 7.0: type: pecl - version: 5.5.0preview + version: 5.3.0 build_dep: [unixodbc-dev] run_dep: [unixodbc] all: @@ -1470,9 +1470,9 @@ extensions_available: already_avail: "{{ php_all_versions }}" sqlsrv: disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0] - 7.3: + 7.0: type: pecl - version: 5.5.0preview + version: 5.3.0 build_dep: [unixodbc-dev] run_dep: [unixodbc] all: