diff --git a/apps/drone/live-runner-podman.hcl b/apps/drone/live-runner-podman.hcl index 8b09181..4b07917 100644 --- a/apps/drone/live-runner-podman.hcl +++ b/apps/drone/live-runner-podman.hcl @@ -37,7 +37,7 @@ job "drone-runner" { driver = "podman" volume_mount { volume = "drone-runner" - destination = "/var/lib/docker" + destination = "/data" read_only = false } diff --git a/apps/drone/live-runner.hcl b/apps/drone/live-runner.hcl index 79f9a09..90e04b5 100644 --- a/apps/drone/live-runner.hcl +++ b/apps/drone/live-runner.hcl @@ -20,14 +20,6 @@ job "drone-runner" { port = "http" } - volume "drone-runner" { - type = "csi" - source = "drone-runner" - read_only = false - access_mode = "single-node-writer" - attachment_mode = "file-system" - } - restart { attempts = 5 delay = "30s" @@ -35,14 +27,10 @@ job "drone-runner" { task "drone-runner" { driver = "podman" - volume_mount { - volume = "drone-runner" - destination = "/drone" - read_only = false - } config { - image = "docker.io/drone/drone-runner-docker:latest" + image = "drone/drone-runner-docker:latest" + force_pull = true ports = ["http"] volumes = [ "/var/run/podman/podman.sock:/var/run/docker.sock", @@ -62,8 +50,8 @@ job "drone-runner" { } resources { - cpu = 500 - memory = 128 + cpu = 100 + memory = 64 } } diff --git a/apps/drone/live.hcl b/apps/drone/live.hcl index 55585fb..7936369 100644 --- a/apps/drone/live.hcl +++ b/apps/drone/live.hcl @@ -23,6 +23,13 @@ job "drone" { "traefik.enable=true", "traefik.http.routers.drone.rule=Host(`drone.service.nr5`)", ] + + check { + type = "http" + path = "/welcome" + interval = "120s" + timeout = "5s" + } } volume "drone-data" { diff --git a/apps/gitea/live.hcl b/apps/gitea/live.hcl index 3ecfaf2..86c4cc4 100644 --- a/apps/gitea/live.hcl +++ b/apps/gitea/live.hcl @@ -51,6 +51,7 @@ job "gitea" { task "gitea" { driver = "podman" + volume_mount { volume = "gitea-data" destination = "/data" @@ -60,6 +61,7 @@ job "gitea" { config { image = "docker.io/gitea/gitea:latest" ports = ["ssh", "http"] + force_pull = true } env { @@ -80,6 +82,7 @@ job "gitea" { GITEA__packages__ENABLED = "true" GITEA__log__LEVEL = "warn" GITEA__actions__ENABLED = "true" + GITEA__webhook__ALLOWED_HOST_LIST = "private" } diff --git a/apps/postgresql/live.hcl b/apps/postgresql/live.hcl index 0c8998b..4042bb9 100644 --- a/apps/postgresql/live.hcl +++ b/apps/postgresql/live.hcl @@ -48,7 +48,7 @@ job "postgres" { resources { cpu = 1000 - memory = 1024 + memory = 512 }