From 9c4490f8207ddfe111043524c45a700a686cbfe2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 1 Dec 2022 10:53:56 +0100 Subject: [PATCH] Fix Redis build and run deps --- .ansible/group_vars/all/mods.yml | 10 ++++++++++ Dockerfiles/mods/Dockerfile-5.2 | 6 ------ Dockerfiles/mods/Dockerfile-5.3 | 6 ------ Dockerfiles/mods/Dockerfile-5.4 | 6 ------ Dockerfiles/mods/Dockerfile-5.5 | 6 ------ Dockerfiles/mods/Dockerfile-5.6 | 6 ------ php_modules/redis/build.yml | 10 ++++++++++ 7 files changed, 20 insertions(+), 30 deletions(-) diff --git a/.ansible/group_vars/all/mods.yml b/.ansible/group_vars/all/mods.yml index b19b61d0..c132fd98 100644 --- a/.ansible/group_vars/all/mods.yml +++ b/.ansible/group_vars/all/mods.yml @@ -1104,18 +1104,28 @@ extensions_available: 5.6: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.5: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.4: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.3: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.2: type: pecl version: 2.2.7 + build_dep: [] + run_dep: [] sqlite3: disabled: [5.2] already_avail: "{{ php_all_versions }}" diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 9617bcbf..26465c2a 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -22,8 +22,6 @@ RUN set -eux \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - liblz4-dev \ - liblzf-dev \ libmagic-dev \ libmcrypt-dev \ libmemcached-dev \ @@ -43,7 +41,6 @@ RUN set -eux \ libxpm-dev \ libxslt-dev \ libzip-dev \ - libzstd-dev \ snmp \ zlib1g-dev \ # Build tools @@ -603,8 +600,6 @@ RUN set -eux \ libfreetype6 \ libicu52 \ libjpeg62-turbo \ - liblz4-1 \ - liblzf1 \ libmagic1 \ libmcrypt4 \ libmemcachedutil2 \ @@ -620,7 +615,6 @@ RUN set -eux \ libxpm4 \ libxslt1.1 \ libzip2 \ - libzstd1 \ snmp \ ca-certificates \ && rm -rf /var/lib/apt/lists/* \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index ce47a80b..9d4c1873 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -26,8 +26,6 @@ RUN set -eux \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - liblz4-dev \ - liblzf-dev \ libmcrypt-dev \ libmemcached-dev \ libmysqlclient-dev \ @@ -49,7 +47,6 @@ RUN set -eux \ libxslt-dev \ libyaml-dev \ libzip-dev \ - libzstd-dev \ re2c \ snmp \ uuid-dev \ @@ -728,8 +725,6 @@ RUN set -eux \ libfreetype6 \ libicu52 \ libjpeg62-turbo \ - liblz4-1 \ - liblzf1 \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ @@ -748,7 +743,6 @@ RUN set -eux \ libxslt1.1 \ libyaml-0-2 \ libzip2 \ - libzstd1 \ snmp \ uuid \ zlib1g \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 1281bef3..f5122df9 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -26,8 +26,6 @@ RUN set -eux \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - liblz4-dev \ - liblzf-dev \ libmcrypt-dev \ libmemcached-dev \ libmysqlclient-dev \ @@ -49,7 +47,6 @@ RUN set -eux \ libxslt-dev \ libyaml-dev \ libzip-dev \ - libzstd-dev \ re2c \ snmp \ uuid-dev \ @@ -739,8 +736,6 @@ RUN set -eux \ libfreetype6 \ libicu52 \ libjpeg62-turbo \ - liblz4-1 \ - liblzf1 \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ @@ -759,7 +754,6 @@ RUN set -eux \ libxslt1.1 \ libyaml-0-2 \ libzip2 \ - libzstd1 \ snmp \ uuid \ zlib1g \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 22a68398..03b2f740 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -27,8 +27,6 @@ RUN set -eux \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - liblz4-dev \ - liblzf-dev \ libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ @@ -51,7 +49,6 @@ RUN set -eux \ libxslt-dev \ libyaml-dev \ libzip-dev \ - libzstd-dev \ re2c \ snmp \ uuid-dev \ @@ -778,8 +775,6 @@ RUN set -eux \ libfreetype6 \ libicu52 \ libjpeg62-turbo \ - liblz4-1 \ - liblzf1 \ libmagickwand-6.q16-2 \ libmcrypt4 \ libmemcachedutil2 \ @@ -799,7 +794,6 @@ RUN set -eux \ libxslt1.1 \ libyaml-0-2 \ libzip2 \ - libzstd1 \ snmp \ uuid \ zlib1g \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 9c436fb3..1f0a7b00 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -27,8 +27,6 @@ RUN set -eux \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ - liblz4-dev \ - liblzf-dev \ libmagickwand-dev \ libmariadbclient-dev \ libmcrypt-dev \ @@ -52,7 +50,6 @@ RUN set -eux \ libxslt-dev \ libyaml-dev \ libzip-dev \ - libzstd-dev \ re2c \ snmp \ uuid-dev \ @@ -797,8 +794,6 @@ RUN set -eux \ libfreetype6 \ libicu57 \ libjpeg62-turbo \ - liblz4-1 \ - liblzf1 \ libmagickwand-6.q16-3 \ libmariadbclient18 \ libmcrypt4 \ @@ -817,7 +812,6 @@ RUN set -eux \ libxslt1.1 \ libyaml-0-2 \ libzip4 \ - libzstd1 \ snmp \ uuid \ zlib1g \ diff --git a/php_modules/redis/build.yml b/php_modules/redis/build.yml index 60907074..9d12e043 100644 --- a/php_modules/redis/build.yml +++ b/php_modules/redis/build.yml @@ -135,19 +135,29 @@ all: 5.6: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.5: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.4: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.3: type: pecl version: 4.3.0 + build_dep: [] + run_dep: [] 5.2: type: pecl version: 2.2.7 + build_dep: [] + run_dep: []