Fix Redis build and run deps

This commit is contained in:
cytopia
2022-12-01 10:53:56 +01:00
parent 6054f92e9e
commit 9c4490f820
7 changed files with 20 additions and 30 deletions

View File

@@ -1104,18 +1104,28 @@ extensions_available:
5.6: 5.6:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.5: 5.5:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.4: 5.4:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.3: 5.3:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.2: 5.2:
type: pecl type: pecl
version: 2.2.7 version: 2.2.7
build_dep: []
run_dep: []
sqlite3: sqlite3:
disabled: [5.2] disabled: [5.2]
already_avail: "{{ php_all_versions }}" already_avail: "{{ php_all_versions }}"

View File

@@ -22,8 +22,6 @@ RUN set -eux \
libjpeg-dev \ libjpeg-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
liblz4-dev \
liblzf-dev \
libmagic-dev \ libmagic-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
@@ -43,7 +41,6 @@ RUN set -eux \
libxpm-dev \ libxpm-dev \
libxslt-dev \ libxslt-dev \
libzip-dev \ libzip-dev \
libzstd-dev \
snmp \ snmp \
zlib1g-dev \ zlib1g-dev \
# Build tools # Build tools
@@ -603,8 +600,6 @@ RUN set -eux \
libfreetype6 \ libfreetype6 \
libicu52 \ libicu52 \
libjpeg62-turbo \ libjpeg62-turbo \
liblz4-1 \
liblzf1 \
libmagic1 \ libmagic1 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
@@ -620,7 +615,6 @@ RUN set -eux \
libxpm4 \ libxpm4 \
libxslt1.1 \ libxslt1.1 \
libzip2 \ libzip2 \
libzstd1 \
snmp \ snmp \
ca-certificates \ ca-certificates \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \

View File

@@ -26,8 +26,6 @@ RUN set -eux \
libjpeg-dev \ libjpeg-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
liblz4-dev \
liblzf-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libmysqlclient-dev \ libmysqlclient-dev \
@@ -49,7 +47,6 @@ RUN set -eux \
libxslt-dev \ libxslt-dev \
libyaml-dev \ libyaml-dev \
libzip-dev \ libzip-dev \
libzstd-dev \
re2c \ re2c \
snmp \ snmp \
uuid-dev \ uuid-dev \
@@ -728,8 +725,6 @@ RUN set -eux \
libfreetype6 \ libfreetype6 \
libicu52 \ libicu52 \
libjpeg62-turbo \ libjpeg62-turbo \
liblz4-1 \
liblzf1 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libmysqlclient18 \ libmysqlclient18 \
@@ -748,7 +743,6 @@ RUN set -eux \
libxslt1.1 \ libxslt1.1 \
libyaml-0-2 \ libyaml-0-2 \
libzip2 \ libzip2 \
libzstd1 \
snmp \ snmp \
uuid \ uuid \
zlib1g \ zlib1g \

View File

@@ -26,8 +26,6 @@ RUN set -eux \
libjpeg-dev \ libjpeg-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
liblz4-dev \
liblzf-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libmysqlclient-dev \ libmysqlclient-dev \
@@ -49,7 +47,6 @@ RUN set -eux \
libxslt-dev \ libxslt-dev \
libyaml-dev \ libyaml-dev \
libzip-dev \ libzip-dev \
libzstd-dev \
re2c \ re2c \
snmp \ snmp \
uuid-dev \ uuid-dev \
@@ -739,8 +736,6 @@ RUN set -eux \
libfreetype6 \ libfreetype6 \
libicu52 \ libicu52 \
libjpeg62-turbo \ libjpeg62-turbo \
liblz4-1 \
liblzf1 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
libmysqlclient18 \ libmysqlclient18 \
@@ -759,7 +754,6 @@ RUN set -eux \
libxslt1.1 \ libxslt1.1 \
libyaml-0-2 \ libyaml-0-2 \
libzip2 \ libzip2 \
libzstd1 \
snmp \ snmp \
uuid \ uuid \
zlib1g \ zlib1g \

View File

@@ -27,8 +27,6 @@ RUN set -eux \
libjpeg-dev \ libjpeg-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
liblz4-dev \
liblzf-dev \
libmagickwand-dev \ libmagickwand-dev \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
@@ -51,7 +49,6 @@ RUN set -eux \
libxslt-dev \ libxslt-dev \
libyaml-dev \ libyaml-dev \
libzip-dev \ libzip-dev \
libzstd-dev \
re2c \ re2c \
snmp \ snmp \
uuid-dev \ uuid-dev \
@@ -778,8 +775,6 @@ RUN set -eux \
libfreetype6 \ libfreetype6 \
libicu52 \ libicu52 \
libjpeg62-turbo \ libjpeg62-turbo \
liblz4-1 \
liblzf1 \
libmagickwand-6.q16-2 \ libmagickwand-6.q16-2 \
libmcrypt4 \ libmcrypt4 \
libmemcachedutil2 \ libmemcachedutil2 \
@@ -799,7 +794,6 @@ RUN set -eux \
libxslt1.1 \ libxslt1.1 \
libyaml-0-2 \ libyaml-0-2 \
libzip2 \ libzip2 \
libzstd1 \
snmp \ snmp \
uuid \ uuid \
zlib1g \ zlib1g \

View File

@@ -27,8 +27,6 @@ RUN set -eux \
libjpeg-dev \ libjpeg-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
liblz4-dev \
liblzf-dev \
libmagickwand-dev \ libmagickwand-dev \
libmariadbclient-dev \ libmariadbclient-dev \
libmcrypt-dev \ libmcrypt-dev \
@@ -52,7 +50,6 @@ RUN set -eux \
libxslt-dev \ libxslt-dev \
libyaml-dev \ libyaml-dev \
libzip-dev \ libzip-dev \
libzstd-dev \
re2c \ re2c \
snmp \ snmp \
uuid-dev \ uuid-dev \
@@ -797,8 +794,6 @@ RUN set -eux \
libfreetype6 \ libfreetype6 \
libicu57 \ libicu57 \
libjpeg62-turbo \ libjpeg62-turbo \
liblz4-1 \
liblzf1 \
libmagickwand-6.q16-3 \ libmagickwand-6.q16-3 \
libmariadbclient18 \ libmariadbclient18 \
libmcrypt4 \ libmcrypt4 \
@@ -817,7 +812,6 @@ RUN set -eux \
libxslt1.1 \ libxslt1.1 \
libyaml-0-2 \ libyaml-0-2 \
libzip4 \ libzip4 \
libzstd1 \
snmp \ snmp \
uuid \ uuid \
zlib1g \ zlib1g \

View File

@@ -135,19 +135,29 @@ all:
5.6: 5.6:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.5: 5.5:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.4: 5.4:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.3: 5.3:
type: pecl type: pecl
version: 4.3.0 version: 4.3.0
build_dep: []
run_dep: []
5.2: 5.2:
type: pecl type: pecl
version: 2.2.7 version: 2.2.7
build_dep: []
run_dep: []