Merge pull request #591 from abtrumpet/fix-soap
Fixed SOAP for both php-fpm and CLI
This commit is contained in:
commit
ffdb35dc6a
@ -17,6 +17,7 @@ services:
|
|||||||
context: ./workspace
|
context: ./workspace
|
||||||
args:
|
args:
|
||||||
- INSTALL_XDEBUG=false
|
- INSTALL_XDEBUG=false
|
||||||
|
- INSTALL_SOAP=false
|
||||||
- INSTALL_MONGO=false
|
- INSTALL_MONGO=false
|
||||||
- INSTALL_NODE=false
|
- INSTALL_NODE=false
|
||||||
- INSTALL_YARN=false
|
- INSTALL_YARN=false
|
||||||
|
@ -44,7 +44,7 @@ ARG INSTALL_SOAP=false
|
|||||||
RUN if [ ${INSTALL_SOAP} = true ]; then \
|
RUN if [ ${INSTALL_SOAP} = true ]; then \
|
||||||
# Install the soap extension
|
# Install the soap extension
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get -y install libxml2-dev && \
|
apt-get -y install libxml2-dev php-soap && \
|
||||||
docker-php-ext-install soap \
|
docker-php-ext-install soap \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ ARG INSTALL_SOAP=false
|
|||||||
RUN if [ ${INSTALL_SOAP} = true ]; then \
|
RUN if [ ${INSTALL_SOAP} = true ]; then \
|
||||||
# Install the soap extension
|
# Install the soap extension
|
||||||
apt-get -y update && \
|
apt-get -y update && \
|
||||||
apt-get -y install libxml2-dev && \
|
apt-get -y install libxml2-dev php-soap && \
|
||||||
docker-php-ext-install soap \
|
docker-php-ext-install soap \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
@ -47,6 +47,23 @@ ARG PGID=1000
|
|||||||
RUN groupadd -g $PGID laradock && \
|
RUN groupadd -g $PGID laradock && \
|
||||||
useradd -u $PUID -g laradock -m 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
|
# Set Timezone
|
||||||
#####################################
|
#####################################
|
||||||
|
Loading…
Reference in New Issue
Block a user