Merge branch 'develop' into feature/use-envs-for-settings

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
     - deploy
 
 test:
-    image: python:3.5
+    image: python:3.7
     stage: test
     services:
         - postgres:latest
@@ -22,7 +22,7 @@ test:
         - python manage.py test
 
 pycodestyle:
-    image: python:3.5
+    image: python:3.7
     stage: lint
     script:
         - pip install pycodestyle

.python-version

@@ -1 +1 @@
-3.6.8
+3.7.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.7
 ENV PYTHONUNBUFFERED 1
 ENV IS_DOCKER 1
 RUN mkdir /code

stack-compose.yml

@@ -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,10 +22,20 @@ 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:
       - 8000:8000
+    volumes:
+      - type: bind
+        source: ./media
+        target: /home/sik/production/media
     environment:
       - SECRET_KEY_FILE=/run/secrets/DJANGO_SECRET_KEY
       - TG_BOT_TOKEN_FILE=/run/secrets/DJANGO_TG_BOT_TOKEN