Merge branch 'develop'

Pipfile

@@ -47,6 +47,7 @@ Django = "==2.1.5"
 ipython_genutils = "==0.1.0"
 Pillow = "==5.4.1"
 PyJWT = "==1.6.4"
+whitenoise = "==4.1.4"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "85a50ecbb054f863d8a149def7c32f916b9cd326aee80c2c86eda2b44ee20e2d"
+            "sha256": "aaefeb42f8fc73a67edd3c9b61176e4735f8daf1393b2685ad8b5274f5199b0d"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -644,6 +644,14 @@
             ],
             "version": "==1.25.6"
         },
+        "whitenoise": {
+            "hashes": [
+                "sha256:22f79cf8f1f509639330f93886acaece8ec5ac5e9600c3b981d33c34e8a42dfd",
+                "sha256:6dfea214b7c12efd689007abf9afa87a426586e9dbc051873ad2c8e535e2a1ac"
+            ],
+            "index": "pypi",
+            "version": "==4.1.4"
+        },
         "xlrd": {
             "hashes": [
                 "sha256:546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2",

requirements.txt

@@ -37,3 +37,4 @@ django-import-export==0.7.0
 openpyxl==2.4.11
 django-app-namespace-template-loader==0.4.1
 django-filter==2.0.0
+whitenoise==4.1.4

sikweb/base.py

@@ -123,6 +123,7 @@ NOSE_ARGS = [
 MIDDLEWARE = [
     'sikweb.middleware.ForceDefaultLanguageMiddleware',
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'corsheaders.middleware.CorsMiddleware',

stack-compose.yml

@@ -1,7 +1,13 @@
 version: '3.2'
 services:
+  networks:
+    outside:
+      external:
+        name: "host"
   backend:
     image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
+    networks:
+      - outside
     ports:
       - 8000:8000
     environment:
@@ -12,7 +18,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: 172.17.0.1
+      DB_HOST: 127.0.0.1
       DB_PORT: 5432
 
     secrets: