Merge branch 'feature/python-and-swarm-mods' into 'develop'
Update to python 3.7 and add deploy policies See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!5
This commit is contained in:
+2
-2
@@ -5,7 +5,7 @@ stages:
|
||||
- deploy
|
||||
|
||||
test:
|
||||
image: python:3.5
|
||||
image: python:3.7
|
||||
stage: test
|
||||
services:
|
||||
- postgres:latest
|
||||
@@ -24,7 +24,7 @@ test:
|
||||
- python manage.py test
|
||||
|
||||
pycodestyle:
|
||||
image: python:3.5
|
||||
image: python:3.7
|
||||
stage: lint
|
||||
script:
|
||||
- pip install pycodestyle
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
3.6.8
|
||||
3.7.4
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM python:3.5
|
||||
FROM python:3.7
|
||||
ENV PYTHONUNBUFFERED 1
|
||||
ENV IS_DOCKER 1
|
||||
RUN mkdir /code
|
||||
|
||||
@@ -2,6 +2,13 @@ version: '3.4'
|
||||
services:
|
||||
db:
|
||||
image: postgres:10
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
update_config:
|
||||
order: start-first
|
||||
|
||||
environment:
|
||||
- POSTGRES_USER_FILE=/run/secrets/DJANGO_DB_USER
|
||||
- POSTGRES_PASSWORD_FILE=/run/secrets/DJANGO_DB_PASSWD
|
||||
@@ -15,6 +22,12 @@ services:
|
||||
|
||||
backend:
|
||||
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
|
||||
deploy:
|
||||
replicas: 1
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
update_config:
|
||||
order: start-first
|
||||
depends_on:
|
||||
- db
|
||||
ports:
|
||||
|
||||
Reference in New Issue
Block a user