Add support for pgclient to workspace & php-fpm
This commit is contained in:
parent
ca9c07eb76
commit
ee03bb607f
|
@ -78,6 +78,7 @@ services:
|
||||||
- INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
|
- INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
|
||||||
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
|
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
|
||||||
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
|
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
|
||||||
|
- PHP_FPM_PG_CLIENT=${PHP_FPM_PG_CLIENT}
|
||||||
- INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
|
- INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
|
||||||
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
|
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
|
||||||
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
|
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
|
||||||
|
|
|
@ -61,6 +61,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
|
||||||
docker-php-ext-install pgsql \
|
docker-php-ext-install pgsql \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# pgsql client
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG PHP_FPM_PG_CLIENT=true
|
||||||
|
RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \
|
||||||
|
# Install the pgsql clint
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get install -y postgresql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# xDebug:
|
# xDebug:
|
||||||
#####################################
|
#####################################
|
||||||
|
|
|
@ -61,6 +61,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
|
||||||
docker-php-ext-install pgsql \
|
docker-php-ext-install pgsql \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# pgsql client
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG PHP_FPM_PG_CLIENT=false
|
||||||
|
RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \
|
||||||
|
# Install the pgsql client
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get install -y postgresql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# xDebug:
|
# xDebug:
|
||||||
#####################################
|
#####################################
|
||||||
|
|
|
@ -61,6 +61,17 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
|
||||||
docker-php-ext-install pgsql \
|
docker-php-ext-install pgsql \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# pgsql client
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG PHP_FPM_PG_CLIENT=false
|
||||||
|
RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \
|
||||||
|
# Install the pgsql client
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get install -y postgresql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
# xDebug:
|
# xDebug:
|
||||||
#####################################
|
#####################################
|
||||||
|
|
|
@ -524,6 +524,17 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
|
||||||
&& rm terraform_0.10.6_linux_amd64.zip \
|
&& rm terraform_0.10.6_linux_amd64.zip \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# pgsql client
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG WORKSPACE_PG_CLIENT=false
|
||||||
|
RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \
|
||||||
|
# Install the pgsql clint
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get -y install postgresql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
# Final Touch
|
# Final Touch
|
||||||
|
|
|
@ -605,6 +605,17 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
|
||||||
&& rm terraform_0.10.6_linux_amd64.zip \
|
&& rm terraform_0.10.6_linux_amd64.zip \
|
||||||
;fi
|
;fi
|
||||||
|
|
||||||
|
#####################################
|
||||||
|
# pgsql client
|
||||||
|
#####################################
|
||||||
|
|
||||||
|
ARG WORKSPACE_PG_CLIENT=false
|
||||||
|
RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \
|
||||||
|
# Install the pgsql client
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get -y install postgresql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
# Final Touch
|
# Final Touch
|
||||||
|
|
|
@ -610,6 +610,15 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
|
||||||
&& mv terraform /usr/local/bin \
|
&& mv terraform /usr/local/bin \
|
||||||
&& rm terraform_0.10.6_linux_amd64.zip \
|
&& rm terraform_0.10.6_linux_amd64.zip \
|
||||||
;fi
|
;fi
|
||||||
|
#####################################
|
||||||
|
# pgsql client
|
||||||
|
#####################################
|
||||||
|
ARG WORKSPACE_PG_CLIENT=false
|
||||||
|
RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \
|
||||||
|
# Install the pgsql clint
|
||||||
|
apt-get update -yqq && \
|
||||||
|
apt-get -y install postgresql-client \
|
||||||
|
;fi
|
||||||
|
|
||||||
#
|
#
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue