Compare commits

...

7 Commits

Author SHA1 Message Date
cbaa137eb6 Merge pull request 'feat: add app-sudaporn-research-normalised' (#6) from neoloc/appsdeploy_sudaporn into master
Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/6
2025-03-09 19:12:28 +11:00
33bd638c59 feat: add app-sudaporn-research-normalised
All checks were successful
Build / build (pull_request) Successful in 1m9s
- application for Sudaporn's research
2025-03-09 19:10:02 +11:00
0b5e5fc1db Merge pull request 'feat: check if zip file is valid' (#5) from neoloc/test_if_zip_is_real into master
Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/5
2024-12-30 01:59:28 +11:00
bb2cae29fd feat: remove deploy.yaml workflow
All checks were successful
Build / build (pull_request) Successful in 39s
- unable to complete successfully
2024-12-30 01:56:55 +11:00
375fba6323 Merge pull request 'feat: wait for artifacts to be created' (#4) from neoloc/deploy_workflow2 into master
Some checks failed
Deploy / deploy (push) Failing after 4s
Build / build (push) Successful in 39s
Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/4
2024-12-30 00:23:49 +11:00
9cb07d9cef feat: wait for artifacts to be created
All checks were successful
Build / build (pull_request) Successful in 39s
2024-12-30 00:22:34 +11:00
809d26349b Merge pull request 'fix: update deployment' (#3) from neoloc/deploy_workflow into master
Some checks failed
Build / build (push) Successful in 37s
Deploy / deploy (push) Failing after 1m10s
Reviewed-on: https://git.query.consul/unkin/terraform-nomad/pulls/3
2024-12-28 22:58:25 +11:00
4 changed files with 72 additions and 36 deletions

View File

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

View File

@ -1,33 +0,0 @@
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

View File

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

View File

@ -0,0 +1,71 @@
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"
}
}
}
}
}