Merge branch 'main' of ssh://gitea.service.nr5:2222/chaos/nomad-nummer5

apps/drone/live-runner-podman-nomad.hcl

@@ -0,0 +1,72 @@
+job "drone-runner" {
+    datacenters = [
+	"nummer5",
+    ]
+	type = "service"
+
+	group "apps" {
+	    count = 1
+
+		network {
+		    mode = "host"
+			port "http" {
+			    to = 3000
+			}
+
+		}
+
+	    service {
+		name = "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"
+	    }
+
+	    task "drone-runner" {
+		driver = "podman"
+		    env {
+# Connection parameters
+			DRONE_RPC_PROTO="http"
+			    DRONE_RPC_HOST="drone.service.nr5"
+			    DRONE_RPC_SECRET="7eb685ed81d0c34bafc5efa7783c20b2"
+# Nomad config
+			    DRONE_JOB_DATACENTER="nummer5"
+			    NOMAD_ADDR="http://nomad.service.nr5"
+# Runner agent settings
+			    DRONE_RUNNER_CAPACITY="1"
+			    DRONE_RUNNER_MAX_PROCS="3"
+			    DRONE_RUNNER_NAME="drone-podman-runner1"
+# Logging
+			    DRONE_DEBUG="true"
+			    DRONE_TRACE="true"
+			    DRONE_RPC_DUMP_HTTP="true"
+			    DRONE_RPC_DUMP_HTTP_BODY="true"
+			    DRONE_TASK_MEMORY="256"
+		    }
+		config {
+		    image = "cr.wks/drone-runner-nomad-podman:latest"
+			volumes = [
+			"/run/podman/podman.sock:/var/run/podman.sock",
+			"/etc/containers:/etc/containers"
+			]
+#network_mode = "slirp4netns"
+			ports = ["http"]
+		}
+		resources {
+		    cpu    = 480
+			memory = 200
+		}
+	}
+}
+}

apps/drone/live-runner-podman.hcl

@@ -0,0 +1,73 @@
+job "drone-runner" {
+  datacenters = [
+    "nummer5",
+  ]
+  type = "service"
+
+  group "apps" {
+    count = 1
+
+    network {
+      mode = "host"
+      port "http" {
+        to = 3000
+      }
+
+    }
+    
+    service {
+        name = "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"
+    }
+
+    task "drone-runner" {
+      driver = "podman"
+      volume_mount {
+        volume      = "drone-runner"
+        destination = "/data"
+        read_only   = false
+      }
+
+      config {
+        image = "cr.wks/drone/drone-runner-podman:latest"
+        force_pull = true
+        ports = ["http"]
+        volumes = [
+          "/run/podman/podman.sock:/run/podman/podman.sock",
+          "/run/podman/podman.sock:/var/run/docker.sock",
+          "/etc/containers:/etc/containers"
+        ]
+ 
+      }
+
+      env {
+        TZ                        = "Europe/Berlin"
+        DRONE_RUNNER_NAME         = "drone-runner01"
+        DRONE_RPC_SECRET          = "7eb685ed81d0c34bafc5efa7783c20b2"
+        DRONE_RPC_HOST            = "drone.service.nr5"
+        DRONE_RPC_PROTO           = "http"
+        DRONE_LOGS_DEBUG          = true
+        DRONE_LOGS_TRACE          = true
+      }
+
+      resources {
+        cpu    = 500
+        memory = 128 
+      }
+
+    }
+  }
+}

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"
+        force_pull = true
         ports = ["http"]
         privileged = true
         volumes = [
@@ -58,13 +46,15 @@ job "drone-runner" {
         DRONE_RPC_SECRET          = "7eb685ed81d0c34bafc5efa7783c20b2"
         DRONE_RPC_HOST            = "drone.service.nr5"
         DRONE_RPC_PROTO           = "http"
+        DRONE_RUNNER_CAPACITY     = 1
         DRONE_LOGS_DEBUG          = true
         DRONE_LOGS_TRACE          = true
+        DOCKER_BUILDKIT           = 1
       }
 
       resources {
-        cpu    = 500
-        memory = 128 
+        cpu    = 300
+        memory = 1500 
       }
 
     }

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" {
@@ -60,8 +67,10 @@ job "drone" {
         DRONE_RPC_SECRET          = "7eb685ed81d0c34bafc5efa7783c20b2"
         DRONE_SERVER_HOST         = "drone.service.nr5"
         DRONE_SERVER_PROTO        = "http"
+        DRONE_JSONNET_ENABLED     = true
         DRONE_LOGS_DEBUG          = true 
         DRONE_LOGS_TRACE          = true
+        DRONE_USER_CREATE         = "username:do,admin:true"
       }
 
       resources {