Merge branch 'develop'

Dockerfile.prod

@@ -5,7 +5,7 @@ WORKDIR /app
 COPY requirements.txt ./
 COPY requirements.production.txt ./
 COPY . ./
-COPY sikweb/settings-sample-prod.py settings.py
+COPY sikweb/settings-sample-prod.py sikweb/settings.py
 
 # uWSGI, gunicorn etc.
 RUN apk add --no-cache --virtual .build-deps python3-dev build-base linux-headers pcre-dev openssl \

docker-compose.yml

@@ -3,8 +3,6 @@ version: '3'
 services:
   db:
     image: postgres
-    volumes:
-      - db-data:/var/lib/postgresql/data
   web:
     build: .
     image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend
@@ -13,5 +11,3 @@ services:
       - "8000:8000"
     depends_on:
       - db
-volumes:
-  db-data: {}