From ee03bb607fb4650dee55f5d0602d63950cd0792f Mon Sep 17 00:00:00 2001
From: Geraint Dong <geraintdong@gmail.com>
Date: Wed, 18 Oct 2017 10:04:23 +0700
Subject: [PATCH] Add support for pgclient to workspace & php-fpm

---
 docker-compose.yml      |  1 +
 php-fpm/Dockerfile-56   | 11 +++++++++++
 php-fpm/Dockerfile-70   | 11 +++++++++++
 php-fpm/Dockerfile-71   | 11 +++++++++++
 workspace/Dockerfile-56 | 11 +++++++++++
 workspace/Dockerfile-70 | 11 +++++++++++
 workspace/Dockerfile-71 |  9 +++++++++
 7 files changed, 65 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2aa41103..abecd829 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,6 +78,7 @@ services:
           - INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
           - INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
           - INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
+          - PHP_FPM_PG_CLIENT=${PHP_FPM_PG_CLIENT}
           - INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
           - INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
           - INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index 057db070..057553b1 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -61,6 +61,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
     docker-php-ext-install pgsql \
 ;fi
 
+#####################################
+# pgsql client
+#####################################
+
+ARG PHP_FPM_PG_CLIENT=true
+RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \
+    # Install the pgsql clint
+    apt-get update -yqq && \
+    apt-get install -y postgresql-client \
+;fi
+
 #####################################
 # xDebug:
 #####################################
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index 7543524f..96b980fe 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -61,6 +61,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
     docker-php-ext-install pgsql \
 ;fi
 
+#####################################
+# pgsql client
+#####################################
+
+ARG PHP_FPM_PG_CLIENT=false
+RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \
+    # Install the pgsql client
+    apt-get update -yqq && \
+    apt-get install -y postgresql-client \
+;fi
+
 #####################################
 # xDebug:
 #####################################
diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71
index a9da3955..02c1a365 100644
--- a/php-fpm/Dockerfile-71
+++ b/php-fpm/Dockerfile-71
@@ -61,6 +61,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
     docker-php-ext-install pgsql \
 ;fi
 
+#####################################
+# pgsql client
+#####################################
+
+ARG PHP_FPM_PG_CLIENT=false
+RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \
+    # Install the pgsql client
+    apt-get update -yqq && \
+    apt-get install -y postgresql-client \
+;fi
+
 #####################################
 # xDebug:
 #####################################
diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
index a3885523..47c56f18 100644
--- a/workspace/Dockerfile-56
+++ b/workspace/Dockerfile-56
@@ -524,6 +524,17 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
     && rm terraform_0.10.6_linux_amd64.zip \
 ;fi
 
+#####################################
+# pgsql client
+#####################################
+
+ARG WORKSPACE_PG_CLIENT=false
+RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \
+    # Install the pgsql clint
+    apt-get update -yqq && \
+    apt-get -y install postgresql-client \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch
diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70
index 297d26df..d3a17f58 100644
--- a/workspace/Dockerfile-70
+++ b/workspace/Dockerfile-70
@@ -605,6 +605,17 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
     && rm terraform_0.10.6_linux_amd64.zip \
 ;fi
 
+#####################################
+# pgsql client
+#####################################
+
+ARG WORKSPACE_PG_CLIENT=false
+RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \
+    # Install the pgsql client
+    apt-get update -yqq && \
+    apt-get -y install postgresql-client \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch
diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
index a57bff60..87f1dc6c 100644
--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@@ -610,6 +610,15 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
     && mv terraform /usr/local/bin \
     && rm terraform_0.10.6_linux_amd64.zip \
 ;fi
+#####################################
+# pgsql client
+#####################################
+ARG WORKSPACE_PG_CLIENT=false
+RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \
+    # Install the pgsql clint
+    apt-get update -yqq && \
+    apt-get -y install postgresql-client \
+;fi
 
 #
 #--------------------------------------------------------------------------