Merge branch 'master' into dev

Author: yeezy-na-izi

.github/workflows/release-ci.yml

@@ -1,14 +1,55 @@
-name: 'build and deploy test server'
+
+name: 'Build and Deploy server'
 
 on:
-  push:
-    branches: master
-  workflow_dispatch:
+  release:
+    types: [ published ]
 
 jobs:
+  test:
+    name: 'Test before deploy'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: cache poetry install
+        uses: actions/cache@v2
+        with:
+          path: ~/.local
+          key: poetry-1.2.2-0
+
+      - uses: snok/install-poetry@v1
+        with:
+          version: 1.2.2
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: cache deps
+        id: cache-deps
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: pydeps-${{ hashFiles('**/poetry.lock') }}
+
+      - run: poetry install --no-root
+        if: steps.cache-deps.outputs.cache-hit != 'true'
+
+      - run: poetry run pip install setuptools
+
+      - name: Run tests
+        run: poetry run python manage.py test
+        env:
+          DEBUG: True
+
   build:
     name: 'Build & Publish'
     runs-on: ubuntu-latest
+    needs: [ test ]
     steps:
       - name: "Checkout repository"
         uses: actions/checkout@v2
@@ -47,11 +88,7 @@ jobs:
           cache-to: type=gha,mode=max
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-  run:
-    runs-on: ubuntu-latest
-    needs: [ build ]
-    steps:
+         
       - name: run on server
         uses: garygrossgarten/github-action-ssh@release
         with:
@@ -78,6 +115,7 @@ jobs:
             echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
             echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
 
-            echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
-
+            echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env 
+            
             docker-compose -f docker-compose.prod-ci.yml -p prod up -d
+

Dockerfile

@@ -23,10 +23,10 @@ RUN poetry config virtualenvs.create false \
 
 EXPOSE 8000
 
+RUN mkdir /procollab/staticfiles
 RUN mkdir /procollab/static
 
 COPY . /procollab/
 
 CMD ["bash", "startup.sh"]
 
-VOLUME ["/procollab/static/"]