Merge pull request #1 from marcoguido/feature/fix-dbms-of-choice

FIX: removed useless env variables
marcoguido · Jun 15, 2020 · 1c67278 · 1c67278
2 parents 283d04e + 76aa410
commit 1c67278
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
@@ -69,17 +69,16 @@ 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
 
 ######################
 # 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 \