[main] Git stuff

This commit is contained in:
2024-12-09 17:50:15 +01:00
parent 78a6317ee5
commit 61e0c670c6
3 changed files with 75 additions and 14 deletions

View File

@@ -18,16 +18,16 @@ jobs:
- name: Build Docker Image
run: |
COMMIT_HASH=$(git rev-parse --short HEAD)
docker build -t registry.i80.dk/gitea/portugalfaq:latest -t registry.i80.dk/gitea/portugalfaq:${COMMIT_HASH} .
docker build -t registry.i80.dk/gitea/[[PROJECT_NAME]]:latest -t registry.i80.dk/gitea/[[PROJECT_NAME]]:${COMMIT_HASH} .
- name: Push Docker Image
run: |
COMMIT_HASH=$(git rev-parse --short HEAD)
echo "registry.i80.dk/gitea/portugalfaq:latest"
echo "registry.i80.dk/gitea/portugalfaq:${COMMIT_HASH}"
docker push registry.i80.dk/gitea/portugalfaq:${COMMIT_HASH}
docker push registry.i80.dk/gitea/portugalfaq:latest
echo "registry.i80.dk/gitea/[[PROJECT_NAME]]:latest"
echo "registry.i80.dk/gitea/[[PROJECT_NAME]]:${COMMIT_HASH}"
docker push registry.i80.dk/gitea/[[PROJECT_NAME]]:${COMMIT_HASH}
docker push registry.i80.dk/gitea/[[PROJECT_NAME]]:latest
- name: Validate Nomad Job
@@ -38,7 +38,7 @@ jobs:
- name: Stop old deployment
env:
NOMAD_ADDR: https://nomad.i80.dk
run: nomad job stop -purge -no-shutdown-delay portugalfaq
run: nomad job stop -purge -no-shutdown-delay [[PROJECT_NAME]]
continue-on-error: true
@@ -48,7 +48,7 @@ jobs:
run: nomad job run .gitea/workflows/nomad-job.hcl
- name: Update Nginx Configuration
run: ssh runner@nomad sudo /opt/nginx_updater/venv/bin/python3 /opt/nginx_updater/nginx_updater.py portugalfaq
run: ssh runner@nomad sudo /opt/nginx_updater/venv/bin/python3 /opt/nginx_updater/nginx_updater.py [[PROJECT_NAME]]
@@ -56,6 +56,6 @@ jobs:
# env:
# NOMAD_ADDR: https://nomad.i80.dk
# run: |
# nomad job stop portugalfaq
# nomad job stop [[PROJECT_NAME]]
# sleep 5 # Optional: Wait to ensure the old allocation is stopped
# nomad job run .gitea/workflows/nomad-job.hcl

View File

@@ -1,4 +1,4 @@
job "portugalfaq" {
job "{{PROJECT_NAME}}" {
region = "global"
datacenters = ["dc1"]
type = "service"
@@ -9,19 +9,19 @@ job "portugalfaq" {
progress_deadline = "6m"
}
group "portugalfaq-group" {
group "[[PROJECT_NAME]]-group" {
count = 1
network {
port "port-app" {
to = 9912 # Internal application port
to = [[PORT]] # Internal application port
}
}
# Register the service with Consul
service {
provider = "consul"
name = "portugalfaq"
name = "[[PROJECT_NAME]]"
port = "port-app"
# Traefik-specific tags for routing
@@ -38,11 +38,11 @@ job "portugalfaq" {
}
}
task "portugalfaq-task" {
task "[[PROJECT_NAME]]-task" {
driver = "docker"
config {
image = "registry.i80.dk/gitea/portugalfaq:latest"
image = "registry.i80.dk/gitea/{{PROJECT_NAME}}:latest"
ports = ["port-app"]
}