ci: Add subpath support

Amsterdam-Music-Lab · Feb 7, 2024 · 3f6292c · 3f6292c
1 parent 7c44eb4
commit 3f6292c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/podman.yml b/.github/workflows/podman.yml
@@ -54,4 +54,8 @@ jobs:
       - name: Check Podman images
         run: podman-compose -f docker-compose-deploy.yml ps
       - name: Check logs
-        run: podman-compose -f docker-compose-deploy.yml logs
+        run: podman-compose -f docker-compose-deploy.yml logs
+      - name: Check if static files are present in backend/static and backend/upload
+        run: |
+          ls -l backend/static
+          ls -l backend/upload
diff --git a/backend/aml/production_settings.py b/backend/aml/production_settings.py
@@ -6,7 +6,13 @@
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
-STATIC_URL = '/django_static/'
+STATIC_URL = '/server/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+MEDIA_URL = '/server/upload/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'upload')
+
+# Make sure Django runs on subpath /server
+FORCE_SCRIPT_NAME = '/server/'
 
 DATABASES = {
     'default': {
@@ -23,6 +29,8 @@
 CSRF_COOKIE_SAMESITE = 'None'
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True
+SESSION_COOKIE_PATH = '/server/'
+CSRF_COOKIE_PATH = '/server/'
 
 LOGGING = {
     'version': 1,