Merge pull request #139 from SpokaneTech/joeriddles/fix-prod-deployment

.github/workflows/django_check.yaml

@@ -0,0 +1,19 @@
+on:
+  push:
+    branches: 
+      - main
+  pull_request:
+
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    name: Check Django
+    steps:
+      - name: "Checkout Repo"
+        uses: actions/checkout@v4
+      - name: Check Django
+        uses: dagger/dagger-for-github@v5
+        with:
+          verb: call 
+          args: "linters check-django"
+          version: "0.12.6"

dagger/src/linters.py

@@ -2,7 +2,7 @@
 from asyncio import CancelledError, TaskGroup
 
 import dagger
-from dagger import object_type, function
+from dagger import function, object_type
 
 
 @object_type
@@ -19,6 +19,13 @@ async def run_linter(self, cmd: list[str]) -> str:
             # The ExecError exposes the
             raise LinterError(exec_error=e)
 
+    @function
+    async def check_django(self) -> str:
+        """
+        Run Django system checks.
+        """
+        return await self.run_linter(["src/manage.py", "check"])
+
     @function
     async def check(self) -> str:
         """
@@ -68,6 +75,7 @@ async def all(self) -> str:
         # Run all the linters
         async with TaskGroup() as tg:
             tasks = [
+                tg.create_task(self.check_django()),
                 tg.create_task(self.check()),
                 tg.create_task(self.format()),
                 tg.create_task(self.bandit()),

docker-compose.yml

@@ -1,4 +1,14 @@
 services:
+  app:
+    image: spokanetech:latest
+    build:
+      context: .
+    container_name: app
+    ports:
+      - "8000:8000"
+    env_file:
+      - .env
+
   worker:
     image: spokanetech:latest
     build:

pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "python-dotenv>=1.0.1",
     "sentry-sdk[celery,django]>=2.1.1",
     "sqlparse>=0.4.4",
+    "pillow>=10.4.0",
 ]
 
 [project.optional-dependencies]

requirements.dev.lock

@@ -242,6 +242,7 @@ pbr==6.1.0
     # via stevedore
 pillow==10.4.0
     # via
+    #   spokanetech (pyproject.toml)
     #   cairosvg
     #   mkdocs-material
 platformdirs==4.2.2

requirements.lock

@@ -176,6 +176,8 @@ oauthlib==3.2.2
     # via requests-oauthlib
 packaging==24.1
     # via gunicorn
+pillow==10.4.0
+    # via spokanetech (pyproject.toml)
 portalocker==2.10.1
     # via msal-extensions
 prometheus-client==0.20.0