WIP

.github/workflows/deploy-development.yml

@@ -0,0 +1,18 @@
+name: Deploy Development
+
+on:
+  push:
+    branches: [ multiple-environments ]
+
+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-development.yaml
+          args: up --build --force-recreate --detach

.github/workflows/deploy-production.yml

@@ -0,0 +1,16 @@
+name: Deploy Production
+
+on: workflow_dispatch
+
+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-production.yaml
+          args: up --build --force-recreate --detach

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

@@ -1,16 +1,16 @@
-name: deploy
+name: Deploy Testing
 
 on: workflow_dispatch
 
 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-testing.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-development.yml

@@ -0,0 +1,18 @@
+name: Migrate Development
+
+on:
+  push:
+    branches: [ multiple-environments ]
+
+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-development.yaml
+          args: run webstrom-backend python manage.py migrate --noinput

.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"
-}
+}

Dockerfile

@@ -10,8 +10,6 @@ RUN pipenv sync --dev --system
 
 COPY . /app
 
-RUN python manage.py restoredb
-
 EXPOSE 8000
 
 ENTRYPOINT [ "daphne", "-b", "0.0.0.0", "-p", "8000", "webstrom.asgi:application" ]

Pipfile

@@ -6,12 +6,13 @@ 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"
 djangorestframework = "~=3.14.0"
 drf-writable-nested = "~=0.7.0"
 pillow = "~=10.3.0"
+psycopg = "~=3.1.18"
 python-magic = "~=0.4.27"
 
 [dev-packages]

deployment/compose-development.yaml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+  webstrom-backend:
+    build: ..
+
+    image: webstrom-backend-development
+
+    environment:
+      - DJANGO_SETTINGS_MODULE=webstrom.settings_development
+
+    volumes:
+      - /var/run/postgresql:/var/run/postgresql:rw
+
+    restart: "always"
+
+    ports:
+      - 8930:8000

deployment/compose-testing.yaml

@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+  webstrom-backend:
+    build: ..
+
+    image: webstrom-backend-testing
+
+    environment:
+      - DJANGO_SETTINGS_MODULE=webstrom.settings_testing
+
+    restart: "always"
+
+    ports:
+      - 8920:8000

requirements.txt

@@ -15,7 +15,7 @@ daphne==4.0.0
 defusedxml==0.7.1
 dill==0.3.8
 dj-rest-auth==5.0.2
-Django==3.2.25
+Django==4.2.11
 django-allauth==0.58.2
 django-filter==23.5
 django-rest-swagger==2.2.0
@@ -34,6 +34,7 @@ oauthlib==3.2.2
 openapi-codec==1.3.2
 pillow==10.3.0
 platformdirs==4.2.0
+psycopg==3.1.18
 pyasn1==0.6.0
 pyasn1_modules==0.4.0
 pycodestyle==2.11.1
@@ -51,7 +52,7 @@ requests-oauthlib==2.0.0
 service-identity==24.1.0
 simplejson==3.19.2
 six==1.16.0
-sqlparse==0.4.4
+sqlparse==0.5.0
 tomlkit==0.12.4
 Twisted==24.3.0
 txaio==23.1.1

webstrom/settings_development.py

@@ -0,0 +1,11 @@
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from .settings import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'webstrom-development',
+        'USER': 'webstrom',
+    }
+}

webstrom/settings_testing.py

@@ -0,0 +1,7 @@
+# pylint: disable=wildcard-import,unused-wildcard-import
+
+from .settings import *
+
+ALLOWED_HOSTS = [
+    "localhost",
+]