From fc28d4fe09efe40fcb145974ac634f192d741ce7 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 4 May 2018 23:54:52 +1000
Subject: [PATCH] Added postgresql module and composer

---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9503b73..a530fa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 - build
 
 variables:
-  BRANCH: mysql
+  BRANCH: mp
   VERSION: 7.2-fpm-${BRANCH}
   CACHETAG: build-${BRANCH}
   DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
diff --git a/Dockerfile b/Dockerfile
index 9e81d14..9641ff4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM php:7.2-fpm
 
-RUN apt-get update && apt-get install -y openssh-server ssmtp && rm -rf /var/lib/apt/lists/* /tmp/* \
+RUN apt-get update && apt-get install -y openssh-server ssmtp libpq-dev && rm -rf /var/lib/apt/lists/* /tmp/* \
 	&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp \
 	&& sed -i -e 's/^mailhub=mail$/mailhub=smtp/' -e "s/^hostname=/#hostname=/" -e 's/#FromLineOverride=YES/FromLineOverride=YES/' /etc/ssmtp/ssmtp.conf
 
@@ -16,4 +16,5 @@ COPY start /usr/local/sbin
 ENTRYPOINT [ "/usr/local/sbin/start" ]
 CMD [ "php-fpm" ]
 
-RUN docker-php-ext-install -j$(nproc) pdo_mysql
+RUN docker-php-ext-install -j$(nproc) pdo_mysql pdo_pgsql
+RUN curl https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer