TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Aarni Halinen
2019-10-08 12:41:51 +03:00
parent ed4e226186 66ed4c0713
commit 389771d106
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stack-compose.yml
+20 -10
View File
@@ -1,9 +1,22 @@
version: '3.4' version: '3'
services: 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: backend:
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
networks:
- outside
ports: ports:
- 8000:8000 - 8000:8000
environment: environment:
@@ -14,7 +27,7 @@ services:
DB_NAME: /run/secrets/DJANGO_DB_NAME DB_NAME: /run/secrets/DJANGO_DB_NAME
DB_USER: /run/secrets/DJANGO_DB_USER DB_USER: /run/secrets/DJANGO_DB_USER
DB_PASSWORD: /run/secrets/DJANGO_DB_PASSWD DB_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
DB_HOST: 127.0.0.1 DB_HOST: db
DB_PORT: 5432 DB_PORT: 5432
secrets: secrets:
@@ -25,12 +38,6 @@ services:
- DJANGO_DB_NAME - DJANGO_DB_NAME
- DJANGO_DB_USER - DJANGO_DB_USER
- DJANGO_DB_PASSWD - DJANGO_DB_PASSWD
networks:
outside:
external:
name: "host"
secrets: secrets:
DJANGO_SECRET_KEY: DJANGO_SECRET_KEY:
external: true external: true
@@ -46,3 +53,6 @@ secrets:
external: true external: true
DJANGO_DB_PASSWD: DJANGO_DB_PASSWD:
external: true external: true
volumes:
dbdata: