Merge branch 'develop'

stack-compose.yml

@@ -1,9 +1,22 @@
-version: '3.4'
+version: '3'
 services:
+  db:
+    image: postgres
+    environment:
+      POSTGRES_USER: /run/secrets/DJANGO_DB_USER
+      POSTGRES_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
+      POSTGRES_DB: /run/secrets/DJANGO_DB_NAME
+    ports:
+      - 5432:5432
+    volumes:
+      - dbdata:/var/lib/postgresql/data
+    secrets:
+      - DJANGO_DB_NAME
+      - DJANGO_DB_USER
+      - DJANGO_DB_PASSWD
+
   backend:
     image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
-    networks:
-      - outside
     ports:
       - 8000:8000
     environment:
@@ -14,7 +27,7 @@ services:
       DB_NAME: /run/secrets/DJANGO_DB_NAME
       DB_USER: /run/secrets/DJANGO_DB_USER
       DB_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
-      DB_HOST: 127.0.0.1
+      DB_HOST: db
       DB_PORT: 5432
 
     secrets:
@@ -25,12 +38,6 @@ services:
       - DJANGO_DB_NAME
       - DJANGO_DB_USER
       - DJANGO_DB_PASSWD
-
-networks:
-  outside:
-    external:
-      name: "host"
-
 secrets:
   DJANGO_SECRET_KEY:
     external: true
@@ -46,3 +53,6 @@ secrets:
     external: true
   DJANGO_DB_PASSWD:
     external: true
+
+volumes:
+  dbdata: