From 46327250be5f6edb26f9eb300e2741cfe0319eff Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 26 Jul 2021 18:53:00 +0200 Subject: [PATCH] rename container from postgres to db --- app/settings.py | 4 ++-- docker-compose-dev.yml | 8 ++++---- docker-compose.yml | 6 +++--- env/debug.env | 2 +- env/prod.env | 2 +- env/prod.env.example | 2 +- env/prod.yml | 7 +++---- env/staging.env | 2 +- env/staging.yml | 7 +++---- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/settings.py b/app/settings.py index 11d4e76b..1a9382c7 100644 --- a/app/settings.py +++ b/app/settings.py @@ -62,9 +62,9 @@ DATABASES = { # Not used with sqlite3. 'PASSWORD': os.environ.get('POSTGRES_PASSWORD'), # Set to empty string for localhost. Not used with sqlite3. - 'HOST': 'postgres', + 'HOST': os.environ.get('DB_HOST'), # Set to empty string for default. Not used with sqlite3. - 'PORT': '', + 'PORT': os.environ.get('DB_PORT'), } } diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index c42fd67d..21adfee8 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -18,7 +18,7 @@ services: - ./var/log/app:/var/log/app - ./var/log/uwsgi:/var/log/uwsgi links: - - postgres + - db - redis ports: - "8000:8000" @@ -42,14 +42,14 @@ services: - ./var/log/app:/var/log/app - ./var/log/uwsgi:/var/log/uwsgi links: - - postgres + - db - redis ports: - "8001:8000" env_file: - 'env/debug.env' - postgres: + db: image: postgres:13 env_file: - env/debug.env @@ -87,7 +87,7 @@ services: volumes: app: - postgres: + db: redis: diff --git a/docker-compose.yml b/docker-compose.yml index a76488f1..b092a133 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,12 +18,12 @@ services: - ./var/log/app:/var/log/app - ./var/log/uwsgi:/var/log/uwsgi links: - - postgres + - db - redis env_file: - env/debug.env - postgres: + db: image: postgres:13 env_file: - env/debug.env @@ -53,5 +53,5 @@ services: volumes: app: - postgres: + db: redis: diff --git a/env/debug.env b/env/debug.env index 90cb7436..d8cb7653 100644 --- a/env/debug.env +++ b/env/debug.env @@ -1,7 +1,7 @@ DEBUG=True DB_PORT=5432 -DB_HOST=postgres +DB_HOST=db POSTGRES_PASSWORD=mysecretpassword POSTGRES_DATABASE=teleforma POSTGRES_USER=teleforma diff --git a/env/prod.env b/env/prod.env index b18ebc9d..5c6eb0b5 100644 --- a/env/prod.env +++ b/env/prod.env @@ -1,7 +1,7 @@ DEBUG=False DB_PORT=5432 -DB_HOST=postgres +DB_HOST=db POSTGRES_PASSWORD=EtOdlerlOt8ob POSTGRES_DATABASE=teleforma POSTGRES_USER=teleforma diff --git a/env/prod.env.example b/env/prod.env.example index 2f7c0448..1291d281 100644 --- a/env/prod.env.example +++ b/env/prod.env.example @@ -1,7 +1,7 @@ DEBUG=False DB_PORT=5432 -DB_HOST=postgres +DB_HOST=db POSTGRES_PASSWORD=mysecretpassword POSTGRES_DATABASE=teleforma POSTGRES_USER=teleforma diff --git a/env/prod.yml b/env/prod.yml index cbfba682..a57041d3 100644 --- a/env/prod.yml +++ b/env/prod.yml @@ -33,15 +33,14 @@ services: ports: - "9004:8000" links: - - postgres + - db - redis env_file: - env/prod.env networks: - teleforma-prod - postgres: - image: postgres:13 + db: env_file: - env/prod.env networks: @@ -59,7 +58,7 @@ services: volumes: app: channels: - postgres: + db: redis: diff --git a/env/staging.env b/env/staging.env index 6571f0f8..ba855787 100644 --- a/env/staging.env +++ b/env/staging.env @@ -1,7 +1,7 @@ DEBUG=True DB_PORT=5432 -DB_HOST=postgres +DB_HOST=db POSTGRES_PASSWORD=mysecretpassword POSTGRES_DATABASE=teleforma POSTGRES_USER=teleforma diff --git a/env/staging.yml b/env/staging.yml index e9e8d8ce..99c6d589 100644 --- a/env/staging.yml +++ b/env/staging.yml @@ -33,15 +33,14 @@ services: ports: - "9002:8000" links: - - postgres + - db - redis env_file: - env/staging.env networks: - teleforma-staging - postgres: - image: postgres:13 + db: env_file: - env/staging.env networks: @@ -58,7 +57,7 @@ services: volumes: app: channels: - postgres: + db: redis: networks: -- 2.39.5