From 76aa4109549b1e56d6b8f6a6a2af3965661258f5 Mon Sep 17 00:00:00 2001 From: Guidolin Marco Date: Mon, 15 Jun 2020 17:03:43 +0200 Subject: [PATCH] FIX: removed useless env variables --- docker/compose-files/workspace.yml | 3 +-- docker/docs/setup.md | 6 ------ docker/workspace/Dockerfile | 7 +++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/docker/compose-files/workspace.yml b/docker/compose-files/workspace.yml index e07063c..96ee6b8 100644 --- a/docker/compose-files/workspace.yml +++ b/docker/compose-files/workspace.yml @@ -12,8 +12,7 @@ services: - XD_REMOTE_PORT=${XD_REMOTE_PORT} - XD_IDEKEY=${XD_IDEKEY} - ENABLE_MCRYPT_SUPPORT=${ENABLE_MCRYPT_SUPPORT} - - ENABLE_MYSQL_SUPPORT=${ENABLE_MYSQL_SUPPORT} - - ENABLE_POSTGRESQL_SUPPORT=${ENABLE_POSTGRESQL_SUPPORT} + - DBMS=${DBMS} - ENABLE_IMAGIC_SUPPORT=${ENABLE_IMAGIC_SUPPORT} - ENABLE_PHPREDIS_SUPPORT=${ENABLE_PHPREDIS_SUPPORT} - ENABLE_INTL_SUPPORT=${ENABLE_INTL_SUPPORT} diff --git a/docker/docs/setup.md b/docker/docs/setup.md index f7acf99..592455a 100644 --- a/docker/docs/setup.md +++ b/docker/docs/setup.md @@ -64,12 +64,6 @@ will now be listed below. ################# # The PHP version. Every 7.x version is fully supported. PHP_VERSION=7.4 - - # Whether to install MySQL support - ENABLE_MYSQL_SUPPORT=true - - # Whether to install PostgreSQL support - ENABLE_POSTGRESQL_SUPPORT=false # Whether to install xDebug support, to easily debug PHP scripts ENABLE_XDEBUG_SUPPORT=true diff --git a/docker/workspace/Dockerfile b/docker/workspace/Dockerfile index 773fb46..5b4a5f4 100755 --- a/docker/workspace/Dockerfile +++ b/docker/workspace/Dockerfile @@ -69,8 +69,8 @@ RUN if [ ${ENABLE_MCRYPT_SUPPORT} = true ] ; then \ ###################### # MYSQL INSTALLATION # ###################### -ARG ENABLE_MYSQL_SUPPORT=false -RUN if [ ${ENABLE_MYSQL_SUPPORT} = true ]; then \ +ARG DBMS +RUN if [ ${DBMS} = mysql ]; then \ docker-php-ext-install pdo_mysql \ && docker-php-ext-install mysqli \ ;fi @@ -78,8 +78,7 @@ RUN if [ ${ENABLE_MYSQL_SUPPORT} = true ]; then \ ###################### # PGSQL INSTALLATION # ###################### -ARG ENABLE_POSTGRESQL_SUPPORT=false -RUN if [ ${ENABLE_POSTGRESQL_SUPPORT} = true ]; then \ +RUN if [ ${DBMS} = postgresql ]; then \ apt-get install -y \ postgresql-client \ libpq-dev \