瀏覽代碼

Fixed SOAP for both php-fpm and CLI

Austin Benesh 8 年之前
父節點
當前提交
cf34c4ed32
共有 4 個文件被更改,包括 20 次插入2 次删除
  1. 1 0
      docker-compose.yml
  2. 1 1
      php-fpm/Dockerfile-56
  3. 1 1
      php-fpm/Dockerfile-70
  4. 17 0
      workspace/Dockerfile

+ 1 - 0
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

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 17 - 0
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
 #####################################