Skip to content

Commit 361192d

Browse files
cytopiacytopia
committed
Fix debs for PHP 5.2 and PHP 5.3
1 parent b937b99 commit 361192d

6 files changed

Lines changed: 32 additions & 27 deletions

File tree

‎Dockerfiles/mods/Dockerfile-5.2‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN set -eux \
3737
libssl-dev \
3838
libtidy-dev \
3939
libvpx-dev \
40+
libwebp-dev \
4041
libxml2-dev \
4142
libxpm-dev \
4243
libxslt-dev \
@@ -576,18 +577,19 @@ RUN set -eux \
576577
libenchant1c2a \
577578
libfbclient2 \
578579
libfreetype6 \
579-
libicu52 \
580+
libicu57 \
580581
libjpeg62-turbo \
582+
libmariadbclient18 \
581583
libmcrypt4 \
582584
libmemcachedutil2 \
583-
libmysqlclient18 \
584-
libpng12-0 \
585+
libpng16-16 \
585586
libpq5 \
586587
librabbitmq4 \
587588
librecode0 \
588589
libsybdb5 \
589-
libtidy-0.99-0 \
590-
libvpx1 \
590+
libtidy5 \
591+
libvpx4 \
592+
libwebp6 \
591593
libxpm4 \
592594
libxslt1.1 \
593595
snmp \

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ RUN set -eux \
4040
libssl-dev \
4141
libtidy-dev \
4242
libvpx-dev \
43+
libwebp-dev \
4344
libxml2-dev \
4445
libxpm-dev \
4546
libxslt-dev \
@@ -691,20 +692,21 @@ RUN set -eux \
691692
libenchant1c2a \
692693
libfbclient2 \
693694
libfreetype6 \
694-
libicu52 \
695+
libicu57 \
695696
libjpeg62-turbo \
697+
libmariadbclient18 \
696698
libmcrypt4 \
697699
libmemcachedutil2 \
698-
libmysqlclient18 \
699-
libnghttp2-5 \
700-
libpng12-0 \
700+
libnghttp2-14 \
701+
libpng16-16 \
701702
libpq5 \
702703
librabbitmq4 \
703704
librdkafka1 \
704705
librecode0 \
705706
libsybdb5 \
706-
libtidy-0.99-0 \
707-
libvpx1 \
707+
libtidy5 \
708+
libvpx4 \
709+
libwebp6 \
708710
libxpm4 \
709711
libxslt1.1 \
710712
libyaml-0-2 \

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,9 @@ RUN set -eux \
319319

320320
# -------------------- Installing PHP Extension: mysql --------------------
321321
RUN set -eux \
322-
# Installation: Generic
322+
# Installation: Version specific
323323
# Type: Built-in extension
324+
# Installation
324325
&& docker-php-ext-install mysql \
325326
&& true
326327

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,9 @@ RUN set -eux \
327327

328328
# -------------------- Installing PHP Extension: mysql --------------------
329329
RUN set -eux \
330-
# Installation: Generic
330+
# Installation: Version specific
331331
# Type: Built-in extension
332+
# Installation
332333
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
333334
&& true
334335

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,8 @@ RUN set -eux \
343343

344344
# -------------------- Installing PHP Extension: mysql --------------------
345345
RUN set -eux \
346-
# Installation: Version specific
346+
# Installation: Generic
347347
# Type: Built-in extension
348-
# Installation
349348
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
350349
&& true
351350

‎build/ansible/group_vars/all/mods.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,12 @@ extensions_available:
280280
ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
281281
ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
282282
configure: --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf
283-
build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev]
284-
run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6]
283+
run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6]
285284
5.3:
286285
type: builtin
287286
pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/
288287
configure: --with-gd --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf
289-
build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev]
290-
run_dep: [libpng12-0, libjpeg62-turbo, libxpm4, libvpx1, libfreetype6]
288+
run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6]
291289
5.4:
292290
type: builtin
293291
pre: ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/
@@ -419,10 +417,10 @@ extensions_available:
419417
intl:
420418
5.2:
421419
type: pecl
422-
run_dep: [libicu52]
420+
run_dep: [libicu57]
423421
5.3:
424422
type: builtin
425-
run_dep: [libicu52]
423+
run_dep: [libicu57]
426424
5.4:
427425
type: builtin
428426
run_dep: [libicu52]
@@ -648,12 +646,15 @@ extensions_available:
648646
mysql:
649647
already_avail: [5.2, 5.3]
650648
disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated in newer versions
651-
5.6:
649+
5.4:
652650
type: builtin
653-
run_dep: [libmariadbclient18]
654-
all:
651+
run_dep: [libmysqlclient18]
652+
5.5:
655653
type: builtin
656654
run_dep: [libmysqlclient18]
655+
all:
656+
type: builtin
657+
run_dep: [libmariadbclient18]
657658
mysqli:
658659
already_avail: [5.2]
659660
all:
@@ -1084,7 +1085,6 @@ extensions_available:
10841085
5.3:
10851086
type: pecl
10861087
version: 1.9.23
1087-
run_dep: [libnghttp2-5]
10881088
5.4:
10891089
type: pecl
10901090
version: 1.9.23
@@ -1119,10 +1119,10 @@ extensions_available:
11191119
tidy:
11201120
5.2:
11211121
type: builtin
1122-
run_dep: [libtidy-0.99-0]
1122+
run_dep: [libtidy5]
11231123
5.3:
11241124
type: builtin
1125-
run_dep: [libtidy-0.99-0]
1125+
run_dep: [libtidy5]
11261126
5.4:
11271127
type: builtin
11281128
run_dep: [libtidy-0.99-0]

0 commit comments

Comments
 (0)