Merge pull request #279 from SELab-2/development

Deployment
SELab-2 · Apr 9, 2024 · 4de9e0d · 4de9e0d
2 parents 2ea8bff + e24c736
commit 4de9e0d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/backend-linting.yaml b/.github/workflows/backend-linting.yaml
@@ -1,8 +1,6 @@
 name: backend-linting
 
 on:
-  push:
-    branches: [main, development]
   pull_request:
     branches: [main, development]
   workflow_dispatch:

diff --git a/.github/workflows/deployement.yml b/.github/workflows/deployement.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -18,6 +19,6 @@ jobs:
           script: |
             cd UGent-7
             docker-compose -f production.yml down
-            git pull
+            git pull --force
             docker-compose -f production.yml build --no-cache
             docker-compose -f production.yml up -d
diff --git a/.github/workflows/frontend-linting.yaml b/.github/workflows/frontend-linting.yaml
@@ -1,8 +1,6 @@
 name: frontend-linting
 
 on:
-  push:
-    branches: [main, development]
   pull_request:
     branches: [main, development]
   workflow_dispatch:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -1,8 +1,6 @@
 name: tests
 
 on:
-  push:
-    branches: [main, development]
   pull_request:
     branches: [main, development]
   workflow_dispatch:

diff --git a/production.yml b/production.yml
@@ -64,7 +64,7 @@ services:
     build:
       context: $BACKEND_DIR
       dockerfile: Dockerfile
-    command: sh -c "./setup.sh && gunicorn --config gunicorn_config.py ypovoli.wsgi:application"
+    command: bash -c "./setup.sh && gunicorn --config gunicorn_config.py ypovoli.wsgi:application"
     expose:
       - 8080
     depends_on: