Merge pull request #1201 from geraintdong/Add_pg_client_to_workspace_phpfpm
Add pg client to workspace phpfpm
This commit is contained in:
commit
c05c675408
@ -80,6 +80,8 @@ services:
|
||||
- INSTALL_EXIF=${PHP_FPM_INSTALL_EXIF}
|
||||
- INSTALL_AEROSPIKE=${PHP_FPM_INSTALL_AEROSPIKE}
|
||||
- INSTALL_MYSQLI=${PHP_FPM_INSTALL_MYSQLI}
|
||||
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
|
||||
- PHP_FPM_PG_CLIENT=${PHP_FPM_PG_CLIENT}
|
||||
- INSTALL_TOKENIZER=${PHP_FPM_INSTALL_TOKENIZER}
|
||||
- INSTALL_INTL=${PHP_FPM_INSTALL_INTL}
|
||||
- INSTALL_GHOSTSCRIPT=${PHP_FPM_INSTALL_GHOSTSCRIPT}
|
||||
|
@ -61,6 +61,7 @@ WORKSPACE_NODE_VERSION=stable
|
||||
WORKSPACE_YARN_VERSION=latest
|
||||
WORKSPACE_TIMEZONE=UTC
|
||||
WORKSPACE_SSH_PORT=2222
|
||||
WORKSPACE_PG_CLIENT=true
|
||||
|
||||
### PHP_FPM ############################################################################################################
|
||||
|
||||
@ -76,6 +77,7 @@ PHP_FPM_INSTALL_OPCACHE=false
|
||||
PHP_FPM_INSTALL_EXIF=false
|
||||
PHP_FPM_INSTALL_AEROSPIKE=false
|
||||
PHP_FPM_INSTALL_MYSQLI=false
|
||||
PHP_FPM_INSTALL_PGSQL=false
|
||||
PHP_FPM_INSTALL_POSTGRES=false
|
||||
PHP_FPM_INSTALL_TOKENIZER=false
|
||||
PHP_FPM_INSTALL_INTL=false
|
||||
|
@ -50,6 +50,28 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \
|
||||
docker-php-ext-install soap \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# pgsql
|
||||
#####################################
|
||||
|
||||
ARG INSTALL_PGSQL=false
|
||||
RUN if [ ${INSTALL_PGSQL} = true ]; then \
|
||||
# Install the pgsql extension
|
||||
apt-get update -yqq && \
|
||||
docker-php-ext-install pgsql \
|
||||
;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:
|
||||
#####################################
|
||||
|
@ -50,6 +50,28 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \
|
||||
docker-php-ext-install soap \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# pgsql
|
||||
#####################################
|
||||
|
||||
ARG INSTALL_PGSQL=false
|
||||
RUN if [ ${INSTALL_PGSQL} = true ]; then \
|
||||
# Install the pgsql extension
|
||||
apt-get update -yqq && \
|
||||
docker-php-ext-install pgsql \
|
||||
;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:
|
||||
#####################################
|
||||
|
@ -50,6 +50,28 @@ RUN if [ ${INSTALL_SOAP} = true ]; then \
|
||||
docker-php-ext-install soap \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# pgsql
|
||||
#####################################
|
||||
|
||||
ARG INSTALL_PGSQL=false
|
||||
RUN if [ ${INSTALL_PGSQL} = true ]; then \
|
||||
# Install the pgsql extension
|
||||
apt-get update -yqq && \
|
||||
docker-php-ext-install pgsql \
|
||||
;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:
|
||||
#####################################
|
||||
|
@ -1442,7 +1442,7 @@ session.save_handler = files
|
||||
; where MODE is the octal representation of the mode. Note that this
|
||||
; does not overwrite the process's umask.
|
||||
; http://php.net/session.save-path
|
||||
;session.save_path = "/tmp"
|
||||
session.save_path = "/tmp"
|
||||
|
||||
; Whether to use strict session mode.
|
||||
; Strict session mode does not accept uninitialized session ID and regenerate
|
||||
|
@ -1348,7 +1348,7 @@ session.save_handler = files
|
||||
; where MODE is the octal representation of the mode. Note that this
|
||||
; does not overwrite the process's umask.
|
||||
; http://php.net/session.save-path
|
||||
;session.save_path = "/tmp"
|
||||
session.save_path = "/tmp"
|
||||
|
||||
; Whether to use strict session mode.
|
||||
; Strict session mode does not accept uninitialized session ID and regenerate
|
||||
|
@ -1348,7 +1348,7 @@ session.save_handler = files
|
||||
; where MODE is the octal representation of the mode. Note that this
|
||||
; does not overwrite the process's umask.
|
||||
; http://php.net/session.save-path
|
||||
;session.save_path = "/tmp"
|
||||
session.save_path = "/tmp"
|
||||
|
||||
; Whether to use strict session mode.
|
||||
; Strict session mode does not accept uninitialized session ID and regenerate
|
||||
|
@ -525,6 +525,17 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
|
||||
&& rm terraform_0.10.6_linux_amd64.zip \
|
||||
;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
|
||||
|
||||
#####################################
|
||||
# Dusk Dependencies:
|
||||
#####################################
|
||||
|
@ -618,6 +618,17 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
|
||||
&& rm terraform_0.10.6_linux_amd64.zip \
|
||||
;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
|
||||
|
||||
#####################################
|
||||
# Dusk Dependencies:
|
||||
#####################################
|
||||
|
@ -623,6 +623,15 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
|
||||
&& mv terraform /usr/local/bin \
|
||||
&& rm terraform_0.10.6_linux_amd64.zip \
|
||||
;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
|
||||
|
||||
#####################################
|
||||
# Dusk Dependencies:
|
||||
|
Loading…
Reference in New Issue
Block a user