Fix variable issues.

Also made the variables introduced with the psql client consistent
with the existing ones. Fixes #1208
This commit is contained in:
Thorvald Falkenburg 2017-10-25 11:40:47 +02:00
parent c05c675408
commit f4ede08b9c
8 changed files with 22 additions and 15 deletions

View File

@ -41,6 +41,7 @@ services:
- INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK} - INSTALL_IMAGEMAGICK=${WORKSPACE_INSTALL_IMAGEMAGICK}
- INSTALL_TERRAFORM=${WORKSPACE_INSTALL_TERRAFORM} - INSTALL_TERRAFORM=${WORKSPACE_INSTALL_TERRAFORM}
- INSTALL_DUSK_DEPS=${WORKSPACE_INSTALL_DUSK_DEPS} - INSTALL_DUSK_DEPS=${WORKSPACE_INSTALL_DUSK_DEPS}
- INSTALL_PG_CLIENT=${WORKSPACE_INSTALL_PG_CLIENT}
- PUID=${WORKSPACE_PUID} - PUID=${WORKSPACE_PUID}
- PGID=${WORKSPACE_PGID} - PGID=${WORKSPACE_PGID}
- CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION} - CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}
@ -81,7 +82,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_PG_CLIENT=${PHP_FPM_INSTALL_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}

View File

@ -54,6 +54,7 @@ WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
WORKSPACE_INSTALL_IMAGEMAGICK=false WORKSPACE_INSTALL_IMAGEMAGICK=false
WORKSPACE_INSTALL_TERRAFORM=false WORKSPACE_INSTALL_TERRAFORM=false
WORKSPACE_INSTALL_DUSK_DEPS=false WORKSPACE_INSTALL_DUSK_DEPS=false
WORKSPACE_INSTALL_PG_CLIENT=false
WORKSPACE_PUID=1000 WORKSPACE_PUID=1000
WORKSPACE_PGID=1000 WORKSPACE_PGID=1000
WORKSPACE_CHROME_DRIVER_VERSION=2.32 WORKSPACE_CHROME_DRIVER_VERSION=2.32
@ -86,6 +87,7 @@ PHP_FPM_INSTALL_LDAP=false
PHP_FPM_INSTALL_SWOOLE=false PHP_FPM_INSTALL_SWOOLE=false
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
PHP_FPM_INSTALL_IMAGEMAGICK=false PHP_FPM_INSTALL_IMAGEMAGICK=false
PHP_FPM_INSTALL_PG_CLIENT=false
### NGINX ############################################################################################################## ### NGINX ##############################################################################################################

View File

@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
# pgsql client # pgsql client
##################################### #####################################
ARG PHP_FPM_PG_CLIENT=true ARG INSTALL_PG_CLIENT=false
RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Install the pgsql clint # Install the pgsql clint
apt-get update -yqq && \ apt-get update -yqq && \
apt-get install -y postgresql-client \ apt-get install -y postgresql-client \

View File

@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
# pgsql client # pgsql client
##################################### #####################################
ARG PHP_FPM_PG_CLIENT=false ARG INSTALL_PG_CLIENT=false
RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Install the pgsql client # Install the pgsql client
apt-get update -yqq && \ apt-get update -yqq && \
apt-get install -y postgresql-client \ apt-get install -y postgresql-client \

View File

@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
# pgsql client # pgsql client
##################################### #####################################
ARG PHP_FPM_PG_CLIENT=false ARG INSTALL_PG_CLIENT=false
RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Install the pgsql client # Install the pgsql client
apt-get update -yqq && \ apt-get update -yqq && \
apt-get install -y postgresql-client \ apt-get install -y postgresql-client \

View File

@ -528,9 +528,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
##################################### #####################################
# pgsql client # pgsql client
##################################### #####################################
USER root
ARG WORKSPACE_PG_CLIENT=false ARG INSTALL_PG_CLIENT=false
RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \ ENV INSTALL_PG_CLIENT ${INSTALL_PG_CLIENT}
RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Install the pgsql clint # Install the pgsql clint
apt-get update -yqq && \ apt-get update -yqq && \
apt-get -y install postgresql-client \ apt-get -y install postgresql-client \

View File

@ -621,9 +621,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
##################################### #####################################
# pgsql client # pgsql client
##################################### #####################################
USER root
ARG WORKSPACE_PG_CLIENT=false ARG INSTALL_PG_CLIENT=false
RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \ ENV INSTALL_PG_CLIENT ${INSTALL_PG_CLIENT}
RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Install the pgsql client # Install the pgsql client
apt-get update -yqq && \ apt-get update -yqq && \
apt-get -y install postgresql-client \ apt-get -y install postgresql-client \

View File

@ -626,8 +626,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
##################################### #####################################
# pgsql client # pgsql client
##################################### #####################################
ARG WORKSPACE_PG_CLIENT=false USER root
RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \ ARG INSTALL_PG_CLIENT=false
ENV INSTALL_PG_CLIENT ${INSTALL_PG_CLIENT}
RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
# Install the pgsql clint # Install the pgsql clint
apt-get update -yqq && \ apt-get update -yqq && \
apt-get -y install postgresql-client \ apt-get -y install postgresql-client \