From cf34c4ed3277dd6bb656e6ca8d7683350cf0a1c6 Mon Sep 17 00:00:00 2001
From: Austin Benesh <austin.benesh@ekragency.com>
Date: Tue, 7 Feb 2017 15:21:30 -0700
Subject: [PATCH] Fixed SOAP for both php-fpm and CLI

---
 docker-compose.yml    |  1 +
 php-fpm/Dockerfile-56 |  2 +-
 php-fpm/Dockerfile-70 |  2 +-
 workspace/Dockerfile  | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3199a3f6..d96bd67c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
             context: ./workspace
             args:
                 - INSTALL_XDEBUG=false
+                - INSTALL_SOAP=false
                 - INSTALL_MONGO=false
                 - INSTALL_NODE=false
                 - INSTALL_YARN=false
diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56
index e012439b..5cdb9200 100644
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@@ -44,7 +44,7 @@ ARG INSTALL_SOAP=false
 RUN if [ ${INSTALL_SOAP} = true ]; then \
     # Install the soap extension
     apt-get -y update && \
-    apt-get -y install libxml2-dev && \ 
+    apt-get -y install libxml2-dev php-soap && \ 
     docker-php-ext-install soap \
 ;fi
 
diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70
index f6071232..93deeae0 100644
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@@ -45,7 +45,7 @@ ARG INSTALL_SOAP=false
 RUN if [ ${INSTALL_SOAP} = true ]; then \
     # Install the soap extension
     apt-get -y update && \
-    apt-get -y install libxml2-dev && \ 
+    apt-get -y install libxml2-dev php-soap && \ 
     docker-php-ext-install soap \
 ;fi
 
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 87482464..39b0996f 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -47,6 +47,23 @@ ARG PGID=1000
 RUN groupadd -g $PGID laradock && \
     useradd -u $PUID -g laradock -m laradock
 
+
+#####################################
+# SOAP:
+#####################################
+USER root
+
+ARG INSTALL_SOAP=false
+ENV INSTALL_SOAP ${INSTALL_SOAP}
+
+RUN if [ ${INSTALL_SOAP} = true ]; then \
+  # Install the PHP SOAP extension
+  apt-get -y update && \
+  add-apt-repository -y ppa:ondrej/php && \
+  apt-get -y install libxml2-dev php7.0-soap && \
+  echo "extension=soap.so" >> /etc/php/7.0/cli/conf.d/40-soap.ini \
+;fi
+
 #####################################
 # Set Timezone
 #####################################