From fdfcc0723bc5a5356c03b0a1d11e6a0f9c38feeb Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Tue, 24 Apr 2018 10:35:18 -0500
Subject: [PATCH] Remove pdo from PHP build

See https://github.com/docker-library/php/issues/620.
---
 comanage-registry-basic-auth/Dockerfile.template       | 2 +-
 comanage-registry-mod-auth-openidc/Dockerfile.template | 2 +-
 comanage-registry-shibboleth-sp/Dockerfile.template    | 5 +++--
 comanage-registry/Dockerfile.template                  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/comanage-registry-basic-auth/Dockerfile.template b/comanage-registry-basic-auth/Dockerfile.template
index b62fad9..e7e62fc 100644
--- a/comanage-registry-basic-auth/Dockerfile.template
+++ b/comanage-registry-basic-auth/Dockerfile.template
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y \
       && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
       && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
       && docker-php-ext-configure mysqli --with-mysqli=/usr/bin/mysql_config \
-      && docker-php-ext-install xsl pdo pdo_mysql pdo_pgsql mysqli pgsql ldap \
+      && docker-php-ext-install xsl pdo_mysql pdo_pgsql mysqli pgsql ldap \
       && docker-php-source delete \
       && apt-get purge -y \
          libldap2-dev \
diff --git a/comanage-registry-mod-auth-openidc/Dockerfile.template b/comanage-registry-mod-auth-openidc/Dockerfile.template
index 2c753b9..28b6451 100644
--- a/comanage-registry-mod-auth-openidc/Dockerfile.template
+++ b/comanage-registry-mod-auth-openidc/Dockerfile.template
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y \
       && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
       && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
       && docker-php-ext-configure mysqli --with-mysqli=/usr/bin/mysql_config \
-      && docker-php-ext-install xsl pdo pdo_mysql pdo_pgsql mysqli pgsql ldap \
+      && docker-php-ext-install xsl pdo_mysql pdo_pgsql mysqli pgsql ldap \
       && docker-php-source delete \
       && apt-get purge -y \
          libldap2-dev \
diff --git a/comanage-registry-shibboleth-sp/Dockerfile.template b/comanage-registry-shibboleth-sp/Dockerfile.template
index e5b11c6..2e4f1e8 100644
--- a/comanage-registry-shibboleth-sp/Dockerfile.template
+++ b/comanage-registry-shibboleth-sp/Dockerfile.template
@@ -20,7 +20,8 @@
 # Official PHP image with Apache HTTPD includes
 # --with-openssl
 # --with-mbstring
-# but xls, pdo, pdo_mysql, pdo_pgsql, mysqli, pgsql, 
+#  and includes pdo
+# but xls, pdo_mysql, pdo_pgsql, mysqli, pgsql, 
 # and ldap extensions must be built.
 FROM php:7.0-apache
 
@@ -168,7 +169,7 @@ RUN apt-get update && apt-get install -y \
       && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
       && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
       && docker-php-ext-configure mysqli --with-mysqli=/usr/bin/mysql_config \
-      && docker-php-ext-install xsl pdo pdo_mysql pdo_pgsql mysqli pgsql ldap \
+      && docker-php-ext-install xsl pdo_mysql pdo_pgsql mysqli pgsql ldap \
       && docker-php-source delete \
       && apt-get purge -y \
          libldap2-dev \
diff --git a/comanage-registry/Dockerfile.template b/comanage-registry/Dockerfile.template
index b62fad9..e7e62fc 100644
--- a/comanage-registry/Dockerfile.template
+++ b/comanage-registry/Dockerfile.template
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y \
       && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
       && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
       && docker-php-ext-configure mysqli --with-mysqli=/usr/bin/mysql_config \
-      && docker-php-ext-install xsl pdo pdo_mysql pdo_pgsql mysqli pgsql ldap \
+      && docker-php-ext-install xsl pdo_mysql pdo_pgsql mysqli pgsql ldap \
       && docker-php-source delete \
       && apt-get purge -y \
          libldap2-dev \