Merge pull request #9 from chnm/feature/cicd-workflows

Merge feature/cicd-workflows into main

.github/workflows/cicd.yml

@@ -0,0 +1,31 @@
+name: "Build and Publish, Deploy Docker Image"
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+    paths:
+      - "**"
+
+jobs:
+  build-publish:
+    uses: chnm/.github/.github/workflows/django--build-publish.yml@main
+    secrets: inherit
+    with:
+
+      container-registry: "ghcr.io"
+      container-image-name: "graffitihouse"
+
+      django-context-root: "."
+
+      website-devl-fqdn: "dev.civilwargraffiti.org"
+      website-prod-fqdn: "civilwargraffiti.org"
+
+  deploy:
+    uses: chnm/.github/.github/workflows/django--deploy.yml@main
+    needs: [build-publish]
+    secrets: inherit
+    with:
+      website-devl-fqdn: "dev.civilwargraffiti.org"
+      website-prod-fqdn: "civilwargraffiti.org"

docker-compose.yml.j2

@@ -22,11 +22,6 @@ services:
       - DB_NAME={{ template.env.db_name }}
       - DB_USER={{ template.env.db_user }}
       - DB_PASS={{ template.env.db_pass }}
-      - OBJ_STORAGE={{ template.env.obj_storage }}
-      - OBJ_STORAGE_ACCESS_KEY_ID={{ template.env.obj_storage_access_key_id }}
-      - OBJ_STORAGE_SECRET_ACCESS_KEY={{ template.env.obj_storage_secret_access_key }}
-      - OBJ_STORAGE_BUCKET_NAME={{ template.env.obj_storage_bucket_name }}
-      - OBJ_STORAGE_ENDPOINT_URL={{ template.env.obj_storage_endpoint_url }}
     command: >
         sh -c "poetry run python3 manage.py migrate &&
                poetry run python3 manage.py runserver 0.0.0.0:8000"