Merge branch 'develop' into api_routes-implementation

Dockerfile.prod

@@ -67,10 +67,10 @@ RUN chmod +x  $APP_HOME/entrypoint.prod.sh
 
 
 # chown all the files to the app user
-RUN chown -R app:app $APP_HOME/
+#RUN chown -R app:app $APP_HOME/
 
 # change to the app user
-USER app
+#USER app
 
 # run entrypoint.prod.sh
 ENTRYPOINT ["/home/app/web/entrypoint.prod.sh"]

backend/entrypoint.prod.sh

@@ -11,4 +11,6 @@ then
     echo "PostgreSQL started"
 fi
 
+python manage.py collectstatic --noinput
+
 exec "$@"

backend/pigeonhole/settings.py

@@ -63,6 +63,8 @@
     "django.middleware.common.CommonMiddleware",
 ]
 
+CSRF_TRUSTED_ORIGINS = ['http://localhost:8000', 'http://localhost:3000', 'https://sel2-1.ugent.be']
+
 CORS_ALLOW_METHODS = [
     "DELETE",
     "GET",

docker-compose.prod.yml

@@ -20,7 +20,7 @@ services:
       context: .
     command: python manage.py runserver 0.0.0.0:8000
     volumes:
-      #- static_volume:/home/app/web/static
+      - static_volume:/home/app/web/backend/static
       - media_volume:/home/app/web/uploads
     expose:
       - 8000
@@ -39,18 +39,19 @@ services:
 
   static:
     container_name: statics
-    image: nginx:alpine
+    image: httpd:latest
     restart: always
     volumes:
-      #- static_volume:/srv
-      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+      - static_volume:/usr/local/apache2/htdocs/
     depends_on:
       - backend
     ports:
       - 5000:80
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.static.rule=Host(`sel2-1.ugent.be`) && PathPrefix(`/static`)"
+      - "traefik.http.routers.static.middlewares=static-stripprefix"
+      - "traefik.http.middlewares.static-stripprefix.stripprefix.prefixes=/static"
       - "traefik.http.routers.static.entrypoints=websecure"
       - "traefik.http.routers.static.tls.certresolver=myresolver"