diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7323ecc..0fa5523 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -31,12 +31,13 @@ services: environment: # environment variables only for Docker - WITH_DOCKER=y - - MYSQL_ROOT_LOGIN=root - - MYSQL_TCP_PORT=3306 + # disabling other env variables because they will override those from the env_file + # - MYSQL_ROOT_LOGIN=root + # - MYSQL_TCP_PORT=3306 # environment variables available for both Docker usage and non Docker usage - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}" - - "MYSQL_PYROS_LOGIN=${MYSQL_PYROS_LOGIN:-pyros}" - - "MYSQL_PYROS_PWD=${MYSQL_PYROS_PWD:-DjangoPyros}" + # - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}" + # - "MYSQL_PYROS_LOGIN=${MYSQL_PYROS_LOGIN:-pyros}" + # - "MYSQL_PYROS_PWD=${MYSQL_PYROS_PWD:-DjangoPyros}" #- "IP_PYROS_USER=${IP_PYROS_USER:-172.28.1.5}" build: args: -- libgit2 0.21.2