WIP

.github/workflows/deploy.yml → .github/workflows/deploy-test.yml

@@ -1,16 +1,16 @@
-name: deploy
+name: Deploy Test Environment
 
-on: workflow_dispatch
+on: push
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: wshihadeh/docker-deployment-action@v2
         with:
           remote_docker_host: [email protected]
           ssh_private_key: ${{ secrets.WEBSTROM_DEPLOY_SSH_PRIVATE_KEY }}
           ssh_public_key: ${{ secrets.WEBSTROM_DEPLOY_SSH_PUBLIC_KEY }}
-          stack_file_name: compose.yaml
+          stack_file_name: deployment/compose-test.yaml
           args: up --build --force-recreate --detach

.github/workflows/main.yml

@@ -16,7 +16,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Upgrade pip
         run: pip3 install --upgrade pip
@@ -37,7 +37,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Upgrade pip
         run: pip3 install --upgrade pip

.github/workflows/migrate-test.yml

@@ -0,0 +1,16 @@
+name: Migrate Test Environment
+
+on: push
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: wshihadeh/docker-deployment-action@v2
+        with:
+          remote_docker_host: [email protected]
+          ssh_private_key: ${{ secrets.WEBSTROM_DEPLOY_SSH_PRIVATE_KEY }}
+          ssh_public_key: ${{ secrets.WEBSTROM_DEPLOY_SSH_PUBLIC_KEY }}
+          stack_file_name: deployment/compose-test.yaml
+          args: run webstrom-backend python manage.py migrate --noinput

.gitignore

@@ -7,9 +7,6 @@ db.sqlite3-journal
 /media
 /protected_media
 
-**/migrations/**
-!**/migrations/__init__.py
-
 fixtures/sources
 !fixtures/sources/*.py
 !fixtures/sources/requirements.txt

.vscode/settings.json

@@ -6,8 +6,11 @@
         "editor.defaultFormatter": "ms-python.autopep8",
         "editor.formatOnSave": true,
     },
+    "files.associations": {
+        "compose-*.yaml": "dockercompose"
+    },
     "git.branchProtection": [
         "master"
     ],
     "git.branchProtectionPrompt": "alwaysCommitToNewBranch"
-}
+}

Pipfile

@@ -4,15 +4,16 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-daphne = "~=4.0.0"
 dj-rest-auth = "~=5.0.1"
-django = "~=3.2.23"
+django = "~=4.2.11"
 django-allauth = "~=0.58.2"
 django-filter = "~=23.5"
 django-sendfile2 = "~=0.7.1"
 djangorestframework = "~=3.14.0"
 drf-writable-nested = "~=0.7.0"
+gunicorn = "~=22.0.0"
 pillow = "~=10.3.0"
+psycopg = "~=3.1.18"
 python-magic = "~=0.4.27"
 
 [dev-packages]