Skip to content

Commit 116edfb

Browse files
committed
Fix various broken PHP 7.0 extensions
1 parent 504d98b commit 116edfb

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

Dockerfiles/mods/Dockerfile-7.0

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ ENV BUILD_DEPS \
5656
libpq-dev \
5757
libsqlite3-dev \
5858
libpq-dev \
59-
libssl-dev \
6059
libpspell-dev \
6160
libedit-dev \
6261
libreadline-dev \
@@ -175,7 +174,6 @@ RUN set -x \
175174
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
176175
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
177176
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \
178-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \
179177
&& ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \
180178
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \
181179
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \
@@ -190,7 +188,6 @@ RUN set -x \
190188
&& cd build && ./install \
191189
&& docker-php-ext-enable phalcon \
192190
&& cd / && rm -rf /tmp/phalcon \
193-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \
194191
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \
195192
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
196193
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \
@@ -326,8 +323,6 @@ RUN set -x \
326323
&& php-fpm -m | grep -oiE '^Zend Opcache$' \
327324
&& php -m | grep -oiE '^pcntl$' \
328325
&& php-fpm -m | grep -oiE '^pcntl$' \
329-
&& php -m | grep -oiE '^pdo$' \
330-
&& php-fpm -m | grep -oiE '^pdo$' \
331326
&& php -m | grep -oiE '^pdo_dblib$' \
332327
&& php-fpm -m | grep -oiE '^pdo_dblib$' \
333328
&& php -m | grep -oiE '^pdo_firebird$' \
@@ -342,8 +337,6 @@ RUN set -x \
342337
&& php-fpm -m | grep -oiE '^pgsql$' \
343338
&& php -m | grep -oiE '^phalcon$' \
344339
&& php-fpm -m | grep -oiE '^phalcon$' \
345-
&& php -m | grep -oiE '^phar$' \
346-
&& php-fpm -m | grep -oiE '^phar$' \
347340
&& php -m | grep -oiE '^posix$' \
348341
&& php-fpm -m | grep -oiE '^posix$' \
349342
&& php -m | grep -oiE '^pspell$' \

build/ansible/group_vars/all.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,8 @@ extensions_available:
707707
pcre:
708708
disabled: "{{ php_all_versions }}" # Available by default
709709
pdo:
710+
# https://github.com/docker-library/php/issues/618
711+
disabled: [7.0] # TODO: Currently disabled due to bug in built
710712
all:
711713
type: builtin
712714
pdo_dblib:
@@ -755,6 +757,8 @@ extensions_available:
755757
git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
756758
command: cd build && ./install
757759
phar:
760+
# https://github.com/docker-library/php/issues/618
761+
disabled: [7.0] # TODO: Currently disabled due to bug in built
758762
all:
759763
type: builtin
760764
build_dep: [libssl-dev]

0 commit comments

Comments
 (0)