Skip to content

Commit 06ac183

Browse files
committed
Fix build for PHP 7.0
1 parent 0181f19 commit 06ac183

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

Dockerfiles/mods/Dockerfile-7.0

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN set -eux \
3838
libmagick++-dev \
3939
libmagickcore-6.q16-dev \
4040
libmagickwand-dev \
41-
libmariadb-dev \
41+
libmariadbclient-dev \
4242
libmcrypt-dev \
4343
libmemcached-dev \
4444
libnghttp2-dev \
@@ -369,8 +369,9 @@ RUN set -eux \
369369

370370
# -------------------- Installing PHP Extension: mysqli --------------------
371371
RUN set -eux \
372-
# Installation: Generic
372+
# Installation: Version specific
373373
# Type: Built-in extension
374+
# Installation
374375
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
375376
&& true
376377

@@ -461,10 +462,11 @@ RUN set -eux \
461462

462463
# -------------------- Installing PHP Extension: pdo_mysql --------------------
463464
RUN set -eux \
464-
# Installation: Generic
465+
# Installation: Version specific
465466
# Type: Built-in extension
466-
# Custom: configure command
467+
# Default: configure command
467468
&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
469+
# Installation
468470
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
469471
&& true
470472

@@ -905,7 +907,7 @@ RUN set -eux \
905907
libmagickcore-6.q16-3-extra \
906908
libmagickwand-6.q16-3 \
907909
libmagickwand-6.q16hdri-3 \
908-
libmariadbd19 \
910+
libmariadbclient18 \
909911
libmcrypt4 \
910912
libmemcachedutil2 \
911913
libnghttp2-14 \

build/ansible/group_vars/all/mods.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,10 @@ extensions_available:
687687
type: builtin
688688
run_dep: [libmariadbclient18]
689689
build_dep: [libmariadbclient-dev]
690+
7.0:
691+
type: builtin
692+
run_dep: [libmariadbclient18]
693+
build_dep: [libmariadbclient-dev]
690694
all:
691695
type: builtin
692696
run_dep: [libmariadbd19]
@@ -808,6 +812,10 @@ extensions_available:
808812
type: builtin
809813
run_dep: [libmariadbclient18]
810814
build_dep: [zlib1g-dev, libmariadbclient-dev]
815+
7.0:
816+
type: builtin
817+
run_dep: [libmariadbclient18]
818+
build_dep: [zlib1g-dev, libmariadbclient-dev]
811819
all:
812820
type: builtin
813821
configure: --with-zlib-dir=/usr

0 commit comments

Comments
 (0)