Merge pull request #5 from PROCOLLAB-github/dev

Static fixed

Author: yakser

.github/workflows/release-ci.yml

@@ -1,4 +1,3 @@
-
 name: 'Build and Deploy server'
 
 on:
@@ -88,34 +87,38 @@ jobs:
           cache-to: type=gha,mode=max
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-         
-      - name: run on server
-        uses: garygrossgarten/github-action-ssh@release
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          password: ${{ secrets.SERVER_PASSWORD }}
-          command: |
-            cd /home/app/procollab-backend
-            docker-compose -f docker-compose.prod-ci.yml -p prod pull
-
-            rm -f .env &&
-            touch .env &&
-
-            echo "DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }}" >> .env &&
-
-            echo "DATABASE_NAME=${{ secrets.DATABASE_NAME }}" >> .env &&
-            echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env &&
-            echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env &&
-            echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env &&
-            echo "DATABASE_PORT=${{ secrets.DATABASE_PORT }}" >> .env &&
-
-            echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
-            echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
-            echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
-            echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
-
-            echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env 
-            
-            docker-compose -f docker-compose.prod-ci.yml -p prod up -d
+
+    run:
+      runs-on: ubuntu-latest
+      needs: [ build ]
+      steps:
+        - name: run on server
+          uses: garygrossgarten/github-action-ssh@release
+          with:
+            host: ${{ secrets.SERVER_HOST }}
+            username: ${{ secrets.SERVER_USER }}
+            password: ${{ secrets.SERVER_PASSWORD }}
+            command: |
+              cd /home/app/procollab-backend
+              docker-compose -f docker-compose.prod-ci.yml -p prod pull
+              
+              rm -f .env &&
+              touch .env &&
+              
+              echo "DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }}" >> .env &&
+              
+              echo "DATABASE_NAME=${{ secrets.DATABASE_NAME }}" >> .env &&
+              echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env &&
+              echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env &&
+              echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env &&
+              echo "DATABASE_PORT=${{ secrets.DATABASE_PORT }}" >> .env &&
+              
+              echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
+              echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
+              echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
+              echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
+              
+              echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env 
+              
+              docker-compose -f docker-compose.prod-ci.yml -p prod up -d
 

poetry.lock

@@ -1,5 +1,4 @@
 import mimetypes
-import os
 from datetime import timedelta
 from pathlib import Path
 
@@ -66,6 +65,7 @@
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.common.CommonMiddleware",
@@ -180,8 +180,9 @@
 # Static files (CSS, JavaScript, Images)
 
 STATIC_URL = "/static/"
-STATIC_ROOT = os.path.join(BASE_DIR, "static/")
+STATIC_ROOT = BASE_DIR / "staticfiles"
 
+STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 
 # Default primary key field type
 

procollab/settings.py

@@ -48,6 +48,7 @@ setuptools = "^65.5.0"
 drf-yasg = "^1.21.4"
 sentry-sdk = "^1.10.1"
 uvicorn = "^0.19.0"
+whitenoise = "^6.2.0"
 
 
 [build-system]