Skip to content

Commit 9c4490f

Browse files
committed
Fix Redis build and run deps
1 parent 6054f92 commit 9c4490f

File tree

7 files changed

+20
-30
lines changed

7 files changed

+20
-30
lines changed

.ansible/group_vars/all/mods.yml

+10
Original file line numberDiff line numberDiff line change
@@ -1104,18 +1104,28 @@ extensions_available:
11041104
5.6:
11051105
type: pecl
11061106
version: 4.3.0
1107+
build_dep: []
1108+
run_dep: []
11071109
5.5:
11081110
type: pecl
11091111
version: 4.3.0
1112+
build_dep: []
1113+
run_dep: []
11101114
5.4:
11111115
type: pecl
11121116
version: 4.3.0
1117+
build_dep: []
1118+
run_dep: []
11131119
5.3:
11141120
type: pecl
11151121
version: 4.3.0
1122+
build_dep: []
1123+
run_dep: []
11161124
5.2:
11171125
type: pecl
11181126
version: 2.2.7
1127+
build_dep: []
1128+
run_dep: []
11191129
sqlite3:
11201130
disabled: [5.2]
11211131
already_avail: "{{ php_all_versions }}"

Dockerfiles/mods/Dockerfile-5.2

-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ RUN set -eux \
2222
libjpeg-dev \
2323
libkrb5-dev \
2424
libldap2-dev \
25-
liblz4-dev \
26-
liblzf-dev \
2725
libmagic-dev \
2826
libmcrypt-dev \
2927
libmemcached-dev \
@@ -43,7 +41,6 @@ RUN set -eux \
4341
libxpm-dev \
4442
libxslt-dev \
4543
libzip-dev \
46-
libzstd-dev \
4744
snmp \
4845
zlib1g-dev \
4946
# Build tools
@@ -603,8 +600,6 @@ RUN set -eux \
603600
libfreetype6 \
604601
libicu52 \
605602
libjpeg62-turbo \
606-
liblz4-1 \
607-
liblzf1 \
608603
libmagic1 \
609604
libmcrypt4 \
610605
libmemcachedutil2 \
@@ -620,7 +615,6 @@ RUN set -eux \
620615
libxpm4 \
621616
libxslt1.1 \
622617
libzip2 \
623-
libzstd1 \
624618
snmp \
625619
ca-certificates \
626620
&& rm -rf /var/lib/apt/lists/* \

Dockerfiles/mods/Dockerfile-5.3

-6
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ RUN set -eux \
2626
libjpeg-dev \
2727
libkrb5-dev \
2828
libldap2-dev \
29-
liblz4-dev \
30-
liblzf-dev \
3129
libmcrypt-dev \
3230
libmemcached-dev \
3331
libmysqlclient-dev \
@@ -49,7 +47,6 @@ RUN set -eux \
4947
libxslt-dev \
5048
libyaml-dev \
5149
libzip-dev \
52-
libzstd-dev \
5350
re2c \
5451
snmp \
5552
uuid-dev \
@@ -728,8 +725,6 @@ RUN set -eux \
728725
libfreetype6 \
729726
libicu52 \
730727
libjpeg62-turbo \
731-
liblz4-1 \
732-
liblzf1 \
733728
libmcrypt4 \
734729
libmemcachedutil2 \
735730
libmysqlclient18 \
@@ -748,7 +743,6 @@ RUN set -eux \
748743
libxslt1.1 \
749744
libyaml-0-2 \
750745
libzip2 \
751-
libzstd1 \
752746
snmp \
753747
uuid \
754748
zlib1g \

Dockerfiles/mods/Dockerfile-5.4

-6
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ RUN set -eux \
2626
libjpeg-dev \
2727
libkrb5-dev \
2828
libldap2-dev \
29-
liblz4-dev \
30-
liblzf-dev \
3129
libmcrypt-dev \
3230
libmemcached-dev \
3331
libmysqlclient-dev \
@@ -49,7 +47,6 @@ RUN set -eux \
4947
libxslt-dev \
5048
libyaml-dev \
5149
libzip-dev \
52-
libzstd-dev \
5350
re2c \
5451
snmp \
5552
uuid-dev \
@@ -739,8 +736,6 @@ RUN set -eux \
739736
libfreetype6 \
740737
libicu52 \
741738
libjpeg62-turbo \
742-
liblz4-1 \
743-
liblzf1 \
744739
libmcrypt4 \
745740
libmemcachedutil2 \
746741
libmysqlclient18 \
@@ -759,7 +754,6 @@ RUN set -eux \
759754
libxslt1.1 \
760755
libyaml-0-2 \
761756
libzip2 \
762-
libzstd1 \
763757
snmp \
764758
uuid \
765759
zlib1g \

Dockerfiles/mods/Dockerfile-5.5

-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN set -eux \
2727
libjpeg-dev \
2828
libkrb5-dev \
2929
libldap2-dev \
30-
liblz4-dev \
31-
liblzf-dev \
3230
libmagickwand-dev \
3331
libmcrypt-dev \
3432
libmemcached-dev \
@@ -51,7 +49,6 @@ RUN set -eux \
5149
libxslt-dev \
5250
libyaml-dev \
5351
libzip-dev \
54-
libzstd-dev \
5552
re2c \
5653
snmp \
5754
uuid-dev \
@@ -778,8 +775,6 @@ RUN set -eux \
778775
libfreetype6 \
779776
libicu52 \
780777
libjpeg62-turbo \
781-
liblz4-1 \
782-
liblzf1 \
783778
libmagickwand-6.q16-2 \
784779
libmcrypt4 \
785780
libmemcachedutil2 \
@@ -799,7 +794,6 @@ RUN set -eux \
799794
libxslt1.1 \
800795
libyaml-0-2 \
801796
libzip2 \
802-
libzstd1 \
803797
snmp \
804798
uuid \
805799
zlib1g \

Dockerfiles/mods/Dockerfile-5.6

-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ RUN set -eux \
2727
libjpeg-dev \
2828
libkrb5-dev \
2929
libldap2-dev \
30-
liblz4-dev \
31-
liblzf-dev \
3230
libmagickwand-dev \
3331
libmariadbclient-dev \
3432
libmcrypt-dev \
@@ -52,7 +50,6 @@ RUN set -eux \
5250
libxslt-dev \
5351
libyaml-dev \
5452
libzip-dev \
55-
libzstd-dev \
5653
re2c \
5754
snmp \
5855
uuid-dev \
@@ -797,8 +794,6 @@ RUN set -eux \
797794
libfreetype6 \
798795
libicu57 \
799796
libjpeg62-turbo \
800-
liblz4-1 \
801-
liblzf1 \
802797
libmagickwand-6.q16-3 \
803798
libmariadbclient18 \
804799
libmcrypt4 \
@@ -817,7 +812,6 @@ RUN set -eux \
817812
libxslt1.1 \
818813
libyaml-0-2 \
819814
libzip4 \
820-
libzstd1 \
821815
snmp \
822816
uuid \
823817
zlib1g \

php_modules/redis/build.yml

+10
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,29 @@ all:
135135
5.6:
136136
type: pecl
137137
version: 4.3.0
138+
build_dep: []
139+
run_dep: []
138140

139141
5.5:
140142
type: pecl
141143
version: 4.3.0
144+
build_dep: []
145+
run_dep: []
142146

143147
5.4:
144148
type: pecl
145149
version: 4.3.0
150+
build_dep: []
151+
run_dep: []
146152

147153
5.3:
148154
type: pecl
149155
version: 4.3.0
156+
build_dep: []
157+
run_dep: []
150158

151159
5.2:
152160
type: pecl
153161
version: 2.2.7
162+
build_dep: []
163+
run_dep: []

0 commit comments

Comments
 (0)