Update running config

Author: Hironsan

app/requirements.txt

@@ -1,8 +1,10 @@
 apache-libcloud==2.4.0
 applicationinsights==0.11.7
+colour==0.1.5
+chardet==3.0.4
 coverage==4.5.3
 dj-database-url==0.5.0
-Django==2.1.7
+Django==2.1.11
 django-cloud-browser==0.5.0
 django-filter==2.0.0
 django-heroku==0.3.1
@@ -11,7 +13,7 @@ django-widget-tweaks==1.4.2
 django-polymorphic==2.0.3
 django-pyodbc-azure==2.1.0.0
 django-rest-polymorphic==0.1.8
-djangorestframework==3.8.2
+djangorestframework==3.10
 djangorestframework-csv==2.1.0
 djangorestframework-filters==0.10.2
 environs==4.1.0
@@ -24,6 +26,8 @@ lockfile==0.12.2
 mixer==6.1.3
 model-mommy==1.6.0
 psycopg2-binary==2.7.7
+pyexcel==0.5.14
+pyexcel-xlsx==0.5.7
 python-dateutil==2.7.3
 pytz==2018.4
 requests==2.21.0

app/tools/run.sh

@@ -2,10 +2,15 @@
 
 set -o errexit
 
+if [[ ! -d "staticfiles" ]]; then
+  echo "Making staticfiles"
+  python manage.py collectstatic --noinput;
+fi
+
 echo "Initializing database"
 python manage.py wait_for_db
 python manage.py migrate
-# python manage.py create_roles
+python manage.py create_roles
 
 if [[ -n "${ADMIN_USERNAME}" ]] && [[ -n "${ADMIN_PASSWORD}" ]] && [[ -n "${ADMIN_EMAIL}" ]]; then
   python manage.py create_admin \

docker-compose.prod.yml

@@ -6,6 +6,7 @@ services:
     command: ["/app/tools/run.sh", "0.0.0.0:8000"]
     volumes:
       - ./app/:/app/
+      - static_volume:/app/staticfiles
     environment:
       ADMIN_USERNAME: "admin"
       ADMIN_PASSWORD: "password"
@@ -26,8 +27,8 @@ services:
   nginx:
     build: ./nginx
     volumes:
-      - static_volume:/home/app/web/staticfiles
       - www:/var/www/html:ro
+      - static_volume:/static
     ports:
       - 80:80
     depends_on:

nginx/nginx.conf

@@ -13,6 +13,18 @@ server {
         proxy_set_header Host $host;
         proxy_redirect off;
     }
+
+    location /admin/ {
+        proxy_pass http://backend:8000/admin/;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /static/ {
+        autoindex on;
+        alias /static/;
+    }
 }
 
 server_tokens off;