rename container from postgres to db

diff --git a/app/settings.py b/app/settings.py
index 11d4e76b89ac9431a2367b86529e9e48b2854865..1a9382c756a2aa8bc6382042a48f04fdfe60db8a 100644 (file)
--- 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 c42fd67d31fa9fcfa5319a83728da17fb1efb5b2..21adfee8444f77af099aca1b20c7bf27ac55fc03 100644 (file)
--- 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 a76488f167111d4cf9282888e091f425669fbc7e..b092a133691a1d8e642549839a8c955bd990163e 100644 (file)
--- 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 90cb743654d3c7e15618a63828a7875ac7168844..d8cb7653b02b0095fd4413dcc721ebe8bfc62055 100644 (file)
--- 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 b18ebc9d53880abf510729c2706a1de5cdb961c1..5c6eb0b5cccd90ad6b3afc35e43b0371c76f689b 100644 (file)
--- 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 2f7c04488877d9a5b4b4e5ff565634a5ea5b751e..1291d2819f04bd2ce8c0deddf687fb8436a48a9c 100644 (file)
--- 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 cbfba682572ecb644bfaf972a9079e883b68f617..a57041d3b52bb45c1b251cab855fe1f4b81ef538 100644 (file)
--- 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 6571f0f8638a09cb617656beba69ffee963f68b0..ba85578706be9488ac8b4d29e92527d7d5a842bd 100644 (file)
--- 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 e9e8d8ce8b1b46c0174460e2ea3edcab1737d4f2..99c6d5894f6dac3d6df8a920f6b993d7c277ebfd 100644 (file)
--- 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: