From 976e320ae796292d4d7b633230a5d85ca69b78f3 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Fri, 8 May 2020 08:34:34 -0400
Subject: [PATCH] add mysql to php7.2

---
 dockerfiles/tasks/php/Dockerfile-7.0 | 2 +-
 dockerfiles/tasks/php/Dockerfile-7.2 | 7 +++++--
 dockerfiles/tasks/php/build.sh       | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dockerfiles/tasks/php/Dockerfile-7.0 b/dockerfiles/tasks/php/Dockerfile-7.0
index 2e5c5e5..4caf48f 100644
--- a/dockerfiles/tasks/php/Dockerfile-7.0
+++ b/dockerfiles/tasks/php/Dockerfile-7.0
@@ -14,7 +14,7 @@ ENV TERM=xterm
 RUN apt-get update && apt-get install -y \
     curl nano sed libwww-perl htop ca-certificates \
     php7.0 php-cli php-fpm php-curl php-pear php-mcrypt php-zip php-mbstring php-xml \
-    php-pgsql php-redis php-soap \
+    php-mysql php-pgsql php-redis php-soap \
     \
   && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
diff --git a/dockerfiles/tasks/php/Dockerfile-7.2 b/dockerfiles/tasks/php/Dockerfile-7.2
index e754386..b140d93 100644
--- a/dockerfiles/tasks/php/Dockerfile-7.2
+++ b/dockerfiles/tasks/php/Dockerfile-7.2
@@ -15,8 +15,9 @@ 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 php7.2-curl php-pear php7.2-mcrypt php7.2-zip php7.2-mbstring php7.2-xml \
-    php7.2-pgsql php7.2-redis \
+    php7.2 php7.2-cli php7.2-fpm php7.2-curl php-pear php7.2-zip php7.2-mbstring php7.2-xml \
+    php7.2-mysql php7.2-pgsql php7.2-redis \
+    php-mcrypt \
     \
   && apt-cache pkgnames | grep php7.2 \
   && rm /usr/bin/php && ln -s /usr/bin/php7.2 /usr/bin/php \
@@ -25,3 +26,5 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
 COPY ./docker-php-fpm.conf /etc/php/7.2fpm/pool.d/www.conf
 
 CMD ["/usr/sbin/php-fpm7.2", "-F"]
+
+#php7.2-mcrypt
diff --git a/dockerfiles/tasks/php/build.sh b/dockerfiles/tasks/php/build.sh
index d22e9ed..8823b94 100755
--- a/dockerfiles/tasks/php/build.sh
+++ b/dockerfiles/tasks/php/build.sh
@@ -16,8 +16,9 @@ build() {
   docker run --rm --entrypoint php xaicorp/php:${version} -m | grep redis
   docker run --rm --entrypoint php xaicorp/php:${version} -m | grep mbstring
   docker run --rm --entrypoint php xaicorp/php:${version} -m | grep mysql
-  docker run --rm --entrypoint php xaicorp/php:${version} -m | grep mcrypt
+#  docker run --rm --entrypoint php xaicorp/php:${version} -m | grep mcrypt
   docker run --rm --entrypoint php xaicorp/php:${version} -m | grep zip
+  docker run --rm --entrypoint php xaicorp/php:${version} -m | grep dom
 
   #register artifact
   docker tag xaicorp/php:${version} dkregistry.xai-corp.net:5000/xaicorp/php:${version}
@@ -40,8 +41,9 @@ build_dev() {
 }
 
 final() {
-  echo
   code=$?
+
+  echo
   if [ ${code} != 0 ]; then
     echo failed
     exit ${code}