From 116edfb3d2f36d1d2d37440fd0b1f1bee7a1374e Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 7 Apr 2018 18:17:29 +0200
Subject: [PATCH] Fix various broken PHP 7.0 extensions

---
 Dockerfiles/mods/Dockerfile-7.0  | 7 -------
 build/ansible/group_vars/all.yml | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
index 73e99f8..196b350 100644
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -56,7 +56,6 @@ ENV BUILD_DEPS \
 	libpq-dev \
 	libsqlite3-dev \
 	libpq-dev \
-	libssl-dev \
 	libpspell-dev \
 	libedit-dev \
 	libreadline-dev \
@@ -175,7 +174,6 @@ RUN set -x \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \
 	&& ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \
@@ -190,7 +188,6 @@ RUN set -x \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& cd / && rm -rf /tmp/phalcon \
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) phar \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) posix \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \
@@ -326,8 +323,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^pcntl$' \
 	&& php-fpm -m | grep -oiE '^pcntl$' \
-	&& php -m | grep -oiE '^pdo$' \
-	&& php-fpm -m | grep -oiE '^pdo$' \
 	&& php -m | grep -oiE '^pdo_dblib$' \
 	&& php-fpm -m | grep -oiE '^pdo_dblib$' \
 	&& php -m | grep -oiE '^pdo_firebird$' \
@@ -342,8 +337,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
 	&& php-fpm -m | grep -oiE '^phalcon$' \
-	&& php -m | grep -oiE '^phar$' \
-	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
 	&& php -m | grep -oiE '^pspell$' \
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index 040f8ee..33abf96 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -707,6 +707,8 @@ extensions_available:
   pcre:
     disabled: "{{ php_all_versions }}" # Available by default
   pdo:
+    # https://github.com/docker-library/php/issues/618
+    disabled: [7.0] # TODO: Currently disabled due to bug in built
     all:
       type: builtin
   pdo_dblib:
@@ -755,6 +757,8 @@ extensions_available:
       git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
       command: cd build && ./install
   phar:
+    # https://github.com/docker-library/php/issues/618
+    disabled: [7.0] # TODO: Currently disabled due to bug in built
     all:
       type: builtin
       build_dep: [libssl-dev]