From 39dfc3bb8772a002484365fb30cdc4852ddf14ca Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Wed, 29 Apr 2020 08:52:55 -0400
Subject: [PATCH] add mbstring redis and pgsql to php7.2 build

---
 dockerfiles/tasks/php/Dockerfile-7.2 |  4 ++--
 dockerfiles/tasks/php/build.sh       | 17 ++++++++++-------
 dockerfiles/tasks/robo/Dockerfile    | 13 +++++++++++++
 dockerfiles/tasks/robo/build.sh      |  2 ++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/dockerfiles/tasks/php/Dockerfile-7.2 b/dockerfiles/tasks/php/Dockerfile-7.2
index ea38552..0c9d987 100644
--- a/dockerfiles/tasks/php/Dockerfile-7.2
+++ b/dockerfiles/tasks/php/Dockerfile-7.2
@@ -15,8 +15,8 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
   && LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php \
   && apt-get update && apt-get install -y \
     curl nano sed libwww-perl htop ca-certificates \
-    php7.2 php7.2-cli php7.2-fpm php-curl php-pear php-mcrypt php-zip php-mbstring php-xml \
-    php-pgsql php-redis php-soap \
+    php7.2 php7.2-cli php7.2-fpm php7.2-curl php-pear php-mcrypt php-zip php7.2-mbstring php-xml \
+    php7.2-pgsql php7.2-redis php-soap \
     \
   && apt-cache pkgnames | grep php7.2 \
   && rm /usr/bin/php && ln -s /usr/bin/php7.2 /usr/bin/php \
diff --git a/dockerfiles/tasks/php/build.sh b/dockerfiles/tasks/php/build.sh
index 443e196..e50c520 100755
--- a/dockerfiles/tasks/php/build.sh
+++ b/dockerfiles/tasks/php/build.sh
@@ -12,6 +12,9 @@ build() {
   #test
   docker run --rm --entrypoint php xaicorp/php:${version} --version | grep ${version}
   docker run --rm --entrypoint php xaicorp/php:${version} -m | grep curl
+  docker run --rm --entrypoint php xaicorp/php:${version} -m | grep pgsql
+  docker run --rm --entrypoint php xaicorp/php:${version} -m | grep redis
+  docker run --rm --entrypoint php xaicorp/php:${version} -m | grep mbstring
 
   #register artifact
   docker tag xaicorp/php:${version} dkregistry.xai-corp.net:5000/xaicorp/php:${version}
@@ -36,14 +39,14 @@ build_dev() {
 build 7.0
 build_dev 7.0
 
-#build 7.1
-#build_dev 7.1
-#
-#build 7.2
-#build_dev 7.2
+build 7.1
+build_dev 7.1
 
-build 7.3
-build_dev 7.3
+build 7.2
+build_dev 7.2
+
+#build 7.3
+#build_dev 7.3
 
 exit
 
diff --git a/dockerfiles/tasks/robo/Dockerfile b/dockerfiles/tasks/robo/Dockerfile
index f760dd2..6c91d89 100644
--- a/dockerfiles/tasks/robo/Dockerfile
+++ b/dockerfiles/tasks/robo/Dockerfile
@@ -19,3 +19,16 @@ RUN mkdir -p /opt/project
 WORKDIR /opt/project
 
 ENTRYPOINT ["php", "/opt/.composer/vendor/bin/robo"]
+
+RUN apt-get update && apt-get install -y apt-transport-https software-properties-common ca-certificates curl gnupg-agent\
+  && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+  && add-apt-repository \
+        "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+        $(lsb_release -cs) \
+        stable" \
+  && apt-get update && apt-get install -y \
+    docker-ce-cli \
+ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN curl -L "https://github.com/docker/compose/releases/download/1.25.5/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose \
+ && chmod +x /usr/bin/docker-compose
diff --git a/dockerfiles/tasks/robo/build.sh b/dockerfiles/tasks/robo/build.sh
index 19fab7e..4c33772 100755
--- a/dockerfiles/tasks/robo/build.sh
+++ b/dockerfiles/tasks/robo/build.sh
@@ -7,6 +7,8 @@ set -ex
 
 docker build --rm -f Dockerfile -t xaicorp/php-robo .
 docker run --rm xaicorp/php-robo --version | grep 'Robo 2.0.'
+docker run --rm --entrypoint docker xaicorp/php-robo -v | grep "Docker version"
+docker run --rm --entrypoint which xaicorp/php-robo docker-compose | grep "docker-compose"
 docker run --rm --entrypoint php xaicorp/php-robo -m | grep 'curl'
 docker tag xaicorp/php-robo dkregistry.xai-corp.net:5000/xaicorp/php-robo
 docker push dkregistry.xai-corp.net:5000/xaicorp/php-robo