PYROS-IRAP / pyros

Commit e5d508968e1774aa7c1d6a00045bc4b985f52d92

Authored by Alexis Koralewski
1 parent d3068189
Exists in dev

Disabling common variables of docker-compose environnement section between this … 

…file and .variables.env
Showing 1 changed file with 6 additions and 5 deletions   Show diff stats
Inline Side-by-side
docker/docker-compose.yml
  Diff comments   View file @e5d5089
... ... @@ -31,12 +31,13 @@ services:
31 31 environment:
32 32 # environment variables only for Docker
33 33 - WITH_DOCKER=y
34   - - MYSQL_ROOT_LOGIN=root
35   - - MYSQL_TCP_PORT=3306
  34 + # disabling other env variables because they will override those from the env_file
  35 + # - MYSQL_ROOT_LOGIN=root
  36 + # - MYSQL_TCP_PORT=3306
36 37 # environment variables available for both Docker usage and non Docker usage
37   - - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}"
38   - - "MYSQL_PYROS_LOGIN=${MYSQL_PYROS_LOGIN:-pyros}"
39   - - "MYSQL_PYROS_PWD=${MYSQL_PYROS_PWD:-DjangoPyros}"
  38 + # - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-root}"
  39 + # - "MYSQL_PYROS_LOGIN=${MYSQL_PYROS_LOGIN:-pyros}"
  40 + # - "MYSQL_PYROS_PWD=${MYSQL_PYROS_PWD:-DjangoPyros}"
40 41 #- "IP_PYROS_USER=${IP_PYROS_USER:-172.28.1.5}"
41 42 build:
42 43 args:
... ...