Merge pull request #1210 from nellonican/fix-env-vars

Fix variable issues.

docker-compose.yml

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

env-example

@@ -54,6 +54,7 @@ WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
 WORKSPACE_INSTALL_IMAGEMAGICK=false
 WORKSPACE_INSTALL_TERRAFORM=false
 WORKSPACE_INSTALL_DUSK_DEPS=false
+WORKSPACE_INSTALL_PG_CLIENT=false
 WORKSPACE_PUID=1000
 WORKSPACE_PGID=1000
 WORKSPACE_CHROME_DRIVER_VERSION=2.32
@@ -61,7 +62,6 @@ WORKSPACE_NODE_VERSION=stable
 WORKSPACE_YARN_VERSION=latest
 WORKSPACE_TIMEZONE=UTC
 WORKSPACE_SSH_PORT=2222
-WORKSPACE_PG_CLIENT=true
 
 ### PHP_FPM ############################################################################################################
 
@@ -86,6 +86,7 @@ PHP_FPM_INSTALL_LDAP=false
 PHP_FPM_INSTALL_SWOOLE=false
 PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=false
 PHP_FPM_INSTALL_IMAGEMAGICK=false
+PHP_FPM_INSTALL_PG_CLIENT=false
 
 ### NGINX ##############################################################################################################
 

php-fpm/Dockerfile-56

@@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
 # 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
     apt-get update -yqq && \
     apt-get install -y postgresql-client \

php-fpm/Dockerfile-70

@@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
 # 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
     apt-get update -yqq && \
     apt-get install -y postgresql-client \

php-fpm/Dockerfile-71

@@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \
 # 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
     apt-get update -yqq && \
     apt-get install -y postgresql-client \

workspace/Dockerfile-56

@@ -528,9 +528,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
 #####################################
 # 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
     apt-get update -yqq && \
     apt-get -y install postgresql-client \

workspace/Dockerfile-70

@@ -621,9 +621,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
 #####################################
 # 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
     apt-get update -yqq && \
     apt-get -y install postgresql-client \

workspace/Dockerfile-71

@@ -626,8 +626,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \
 #####################################
 # 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
     apt-get update -yqq && \
     apt-get -y install postgresql-client \