.gitea/workflows/build.yaml

@@ -2,6 +2,9 @@ name: Build
 
 on:
   pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   build:

.gitea/workflows/deploy.yaml

@@ -0,0 +1,33 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: almalinux-8
+    container:
+      image: git.query.consul/unkin/almalinux8-runnerdnd:latest
+      options: --privileged
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: plans
+          path: /workspace/unkin/terraform-nomad/plans
+
+      - name: Install Packages
+        run: |
+          dnf install terraform terragrunt vault jq -y
+
+      - name: Run Terraform Apply
+        env:
+          VAULT_ROLEID: ${{ secrets.TERRAFORM_NOMAD_VAULT_ROLEID }}
+        run: |
+          make apply

environments/au-syd1/terragrunt.hcl

@@ -6,7 +6,6 @@ inputs = {
   job_files  = [
     "testapp1",
     "testapp2",
-    "app-sudaporn-research-normalised",
   ]
   policy_files = []
 }

jobs/app-sudaporn-research-normalised.hcl

@@ -1,71 +0,0 @@
-job "app-sudaporn-research-normalised" {
-  datacenters = ["au-syd1"]
-  type        = "service"
-
-  group "app" {
-    count = 2
-
-    network {
-      port "http" {
-        to = 80
-      }
-    }
-
-    update {
-      max_parallel      = 1
-      health_check      = "checks"
-      min_healthy_time  = "30s"
-      healthy_deadline  = "5m"
-      progress_deadline = "10m"
-      auto_revert       = true
-      auto_promote      = true
-      canary            = 1
-      stagger           = "20s"
-    }
-
-    # Ensure instances run on different agents
-    spread {
-      attribute = "${node.unique.id}"
-      weight    = 100
-    }
-
-    # Application Task
-    task "webapp" {
-      driver = "docker"
-
-      config {
-        image = "git.query.consul/unkin/almalinux9-base:latest"
-        network_mode = "bridge"
-        ports = ["http"]
-        command = "sh"
-        args = [
-          "-c",
-          "rm -rf /app && git clone https://git.query.consul/unkin/app-sudaporn-research-normalised.git /app && cd /app && make run"
-        ]
-      }
-
-      env {
-        PORT = "80"
-        PYTHONUNBUFFERED = "1"
-      }
-
-      resources {
-        cpu    = 500
-        memory = 350
-      }
-
-      service {
-        name = "app-sudaporn-research-normalised"
-        port = "http"
-        address_mode = "driver"
-
-        check {
-          type     = "http"
-          path     = "/"
-          interval = "10s"
-          timeout  = "2s"
-        }
-      }
-    }
-  }
-}