From f4ede08b9c0b3ba6da27395576d79bd3a79a6801 Mon Sep 17 00:00:00 2001 From: Thorvald Falkenburg Date: Wed, 25 Oct 2017 11:40:47 +0200 Subject: [PATCH 1/2] Fix variable issues. Also made the variables introduced with the psql client consistent with the existing ones. Fixes #1208 --- docker-compose.yml | 3 ++- env-example | 2 ++ php-fpm/Dockerfile-56 | 4 ++-- php-fpm/Dockerfile-70 | 4 ++-- php-fpm/Dockerfile-71 | 4 ++-- workspace/Dockerfile-56 | 7 ++++--- workspace/Dockerfile-70 | 7 ++++--- workspace/Dockerfile-71 | 6 ++++-- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bd69ec9..8bff74f 100644 --- a/docker-compose.yml +++ b/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} diff --git a/env-example b/env-example index c8a6294..ad206b5 100644 --- a/env-example +++ b/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 @@ -86,6 +87,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 ############################################################################################################## diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 057553b..8d5ed0b 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \ # pgsql client ##################################### -ARG PHP_FPM_PG_CLIENT=true -RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \ +ARG INSTALL_PG_CLIENT=false +RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \ # Install the pgsql clint apt-get update -yqq && \ apt-get install -y postgresql-client \ diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index f621a9a..3530b76 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \ # pgsql client ##################################### -ARG PHP_FPM_PG_CLIENT=false -RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \ +ARG INSTALL_PG_CLIENT=false +RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \ # Install the pgsql client apt-get update -yqq && \ apt-get install -y postgresql-client \ diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index b2d5552..cefc64c 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -65,8 +65,8 @@ RUN if [ ${INSTALL_PGSQL} = true ]; then \ # pgsql client ##################################### -ARG PHP_FPM_PG_CLIENT=false -RUN if [ ${PHP_FPM_PG_CLIENT} = true ]; then \ +ARG INSTALL_PG_CLIENT=false +RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \ # Install the pgsql client apt-get update -yqq && \ apt-get install -y postgresql-client \ diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index 8e9e486..968596f 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -528,9 +528,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ ##################################### # pgsql client ##################################### - -ARG WORKSPACE_PG_CLIENT=false -RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \ +USER root +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 \ diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index fc814af..f1e0ebb 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -621,9 +621,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ ##################################### # pgsql client ##################################### - -ARG WORKSPACE_PG_CLIENT=false -RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \ +USER root +ARG INSTALL_PG_CLIENT=false +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 \ diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 44416ae..2dfbf44 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -626,8 +626,10 @@ RUN if [ ${INSTALL_TERRAFORM} = true ]; then \ ##################################### # pgsql client ##################################### -ARG WORKSPACE_PG_CLIENT=false -RUN if [ ${WORKSPACE_PG_CLIENT} = true ]; then \ +USER root +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 \ From a31114955aa46e6e62caa81480656e0dc782637a Mon Sep 17 00:00:00 2001 From: Thorvald Falkenburg Date: Wed, 25 Oct 2017 12:12:20 +0200 Subject: [PATCH 2/2] Remove variable --- env-example | 1 - 1 file changed, 1 deletion(-) diff --git a/env-example b/env-example index ad206b5..692f08a 100644 --- a/env-example +++ b/env-example @@ -62,7 +62,6 @@ WORKSPACE_NODE_VERSION=stable WORKSPACE_YARN_VERSION=latest WORKSPACE_TIMEZONE=UTC WORKSPACE_SSH_PORT=2222 -WORKSPACE_PG_CLIENT=true ### PHP_FPM ############################################################################################################