From 2130407a0f9968ae272677e4fe787732b5bdad94 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 31 May 2022 11:59:20 +0200
Subject: Move back to using Docker runner

---
 app/drone-ci/deploy/bad-runner-vm.hcl   | 48 +++++++++++++++++
 app/drone-ci/deploy/runner-docker.hcl   | 91 +++++++++++++++++++++++++++++++++
 app/drone-ci/deploy/runner-insecure.hcl | 91 ---------------------------------
 app/drone-ci/deploy/runner-vm.hcl       | 48 -----------------
 4 files changed, 139 insertions(+), 139 deletions(-)
 create mode 100644 app/drone-ci/deploy/bad-runner-vm.hcl
 create mode 100644 app/drone-ci/deploy/runner-docker.hcl
 delete mode 100644 app/drone-ci/deploy/runner-insecure.hcl
 delete mode 100644 app/drone-ci/deploy/runner-vm.hcl

diff --git a/app/drone-ci/deploy/bad-runner-vm.hcl b/app/drone-ci/deploy/bad-runner-vm.hcl
new file mode 100644
index 0000000..7c3a7e2
--- /dev/null
+++ b/app/drone-ci/deploy/bad-runner-vm.hcl
@@ -0,0 +1,48 @@
+job "drone-runner" {
+  datacenters = ["neptune"]
+  type = "system"
+
+  group "runner-vm" {
+    network {
+      port "ssh" {
+        static = 22544
+      }
+    }
+
+    task "drone-runner-vm" {
+      driver = "qemu"
+
+      config {
+        image_path = "local/drone-runner.qcow2"
+        accelerator = "kvm"
+        args = [
+          "-drive", "index=1,file=fat:rw:/var/lib/nomad/alloc/${NOMAD_ALLOC_ID}/${NOMAD_TASK_NAME}/secrets,format=raw,media=disk",
+          "-device", "e1000,netdev=user.0",
+          "-netdev", "user,id=user.0,hostfwd=tcp::${NOMAD_PORT_ssh}-:22",
+          "-smp", "2",
+        ]
+        port_map {
+          ssh = 22
+        }
+      }
+
+      artifact {
+        source = "https://alex.web.deuxfleurs.fr/drone-runner.qcow2.zst"
+        destination = "local/drone-runner.qcow2"
+        mode = "file"
+      }
+
+      template {
+        data = <<EOH
+DRONE_RPC_SECRET={{ key "secrets/drone-ci/rpc_secret" | trimSpace }}
+DRONE_RUNNER_NAME={{ env "attr.unique.hostname" }}
+EOH
+        destination = "secrets/secret_env"
+      }
+
+      resources {
+        memory = 2000
+      }
+    }
+  }
+}
diff --git a/app/drone-ci/deploy/runner-docker.hcl b/app/drone-ci/deploy/runner-docker.hcl
new file mode 100644
index 0000000..1f823bf
--- /dev/null
+++ b/app/drone-ci/deploy/runner-docker.hcl
@@ -0,0 +1,91 @@
+job "drone-runner" {
+  datacenters = ["neptune"]
+  type = "system"
+
+  group "runner" {
+
+    task "populate-nix-store" {
+      lifecycle {
+        hook = "prestart"
+        sidecar = false
+      }
+
+      driver = "docker"
+      config {
+        image = "nixpkgs/nix:nixos-21.05"
+        command = "sh"
+        args = [
+          "-c", "cp -rv /nix/{store,var} /mnt/"
+        ]
+        volumes = [
+          "/var/lib/drone/nix:/mnt",
+        ]
+      }
+
+      resources {
+        memory = 100
+        cpu = 100
+      }
+    }
+
+    task "drone-runner" {
+      driver = "docker"
+      config {
+        image = "drone/drone-runner-docker:1.8.1"
+
+        volumes = [
+          "/var/lib/drone/nix:/nix",
+          "/var/run/docker.sock:/var/run/docker.sock"
+        ]
+      }
+
+      template {
+        data = <<EOH
+DRONE_RPC_PROTO=https
+DRONE_RPC_HOST=drone.deuxfleurs.fr
+DRONE_RPC_SECRET={{ key "secrets/drone-ci/rpc_secret" | trimSpace }}
+DRONE_RUNNER_CAPACITY=1
+DRONE_DEBUG=true
+DRONE_LOGS_TRACE=true
+DRONE_RPC_DUMP_HTTP=true
+DRONE_RPC_DUMP_HTTP_BODY=true
+DRONE_RUNNER_NAME={{ env "attr.unique.hostname" }}
+DRONE_RUNNER_LABELS=nix:1
+EOH
+        destination = "secrets/env"
+        env = true
+      }
+
+      resources {
+        memory = 200
+        cpu = 100
+      }
+    }
+  
+    task "drone-gc" {
+      driver = "docker"
+      config {
+        image = "drone/gc:latest"
+
+        volumes = [
+          "/var/run/docker.sock:/var/run/docker.sock"
+        ]
+      }
+
+      template {
+        data = <<EOH
+GC_DEBUG=true
+GC_CACHE=10gb
+GC_INTERVAL=10m
+EOH
+        destination = "secrets/env"
+        env = true
+      }
+
+      resources {
+        memory = 100
+        cpu = 100
+      }
+    }
+  }
+}
diff --git a/app/drone-ci/deploy/runner-insecure.hcl b/app/drone-ci/deploy/runner-insecure.hcl
deleted file mode 100644
index 2ea5638..0000000
--- a/app/drone-ci/deploy/runner-insecure.hcl
+++ /dev/null
@@ -1,91 +0,0 @@
-job "drone-runner" {
-  datacenters = ["neptune"]
-  type = "system"
-
-  group "runner" {
-
-    task "populate-nix-store" {
-      lifecycle {
-        hook = "prestart"
-        sidecar = false
-      }
-
-      driver = "docker"
-      config {
-        image = "nixpkgs/nix:nixos-21.05"
-        command = "sh"
-        args = [
-          "-c", "cp -rv /nix/{store,var} /mnt/"
-        ]
-        volumes = [
-          "/var/lib/drone/nix:/mnt",
-        ]
-      }
-
-      resources {
-        memory = 100
-        cpu = 100
-      }
-    }
-
-    task "drone-runner" {
-      driver = "docker"
-      config {
-        image = "drone/drone-runner-docker:1.4.0"
-
-        volumes = [
-          "/var/lib/drone/nix:/nix",
-          "/var/run/docker.sock:/var/run/docker.sock"
-        ]
-      }
-
-      template {
-        data = <<EOH
-DRONE_RPC_PROTO=https
-DRONE_RPC_HOST=drone.deuxfleurs.fr
-DRONE_RPC_SECRET={{ key "secrets/drone-ci/rpc_secret" | trimSpace }}
-DRONE_RUNNER_CAPACITY=1
-DRONE_DEBUG=true
-DRONE_LOGS_TRACE=true
-DRONE_RPC_DUMP_HTTP=true
-DRONE_RPC_DUMP_HTTP_BODY=true
-DRONE_RUNNER_NAME={{ env "attr.unique.hostname" }}
-DRONE_RUNNER_LABELS=nix:1
-EOH
-        destination = "secrets/env"
-        env = true
-      }
-
-      resources {
-        memory = 200
-        cpu = 100
-      }
-    }
-  
-    task "drone-gc" {
-      driver = "docker"
-      config {
-        image = "drone/gc:latest"
-
-        volumes = [
-          "/var/run/docker.sock:/var/run/docker.sock"
-        ]
-      }
-
-      template {
-        data = <<EOH
-GC_DEBUG=true
-GC_CACHE=10gb
-GC_INTERVAL=10m
-EOH
-        destination = "secrets/env"
-        env = true
-      }
-
-      resources {
-        memory = 100
-        cpu = 100
-      }
-    }
-  }
-}
diff --git a/app/drone-ci/deploy/runner-vm.hcl b/app/drone-ci/deploy/runner-vm.hcl
deleted file mode 100644
index 7c3a7e2..0000000
--- a/app/drone-ci/deploy/runner-vm.hcl
+++ /dev/null
@@ -1,48 +0,0 @@
-job "drone-runner" {
-  datacenters = ["neptune"]
-  type = "system"
-
-  group "runner-vm" {
-    network {
-      port "ssh" {
-        static = 22544
-      }
-    }
-
-    task "drone-runner-vm" {
-      driver = "qemu"
-
-      config {
-        image_path = "local/drone-runner.qcow2"
-        accelerator = "kvm"
-        args = [
-          "-drive", "index=1,file=fat:rw:/var/lib/nomad/alloc/${NOMAD_ALLOC_ID}/${NOMAD_TASK_NAME}/secrets,format=raw,media=disk",
-          "-device", "e1000,netdev=user.0",
-          "-netdev", "user,id=user.0,hostfwd=tcp::${NOMAD_PORT_ssh}-:22",
-          "-smp", "2",
-        ]
-        port_map {
-          ssh = 22
-        }
-      }
-
-      artifact {
-        source = "https://alex.web.deuxfleurs.fr/drone-runner.qcow2.zst"
-        destination = "local/drone-runner.qcow2"
-        mode = "file"
-      }
-
-      template {
-        data = <<EOH
-DRONE_RPC_SECRET={{ key "secrets/drone-ci/rpc_secret" | trimSpace }}
-DRONE_RUNNER_NAME={{ env "attr.unique.hostname" }}
-EOH
-        destination = "secrets/secret_env"
-      }
-
-      resources {
-        memory = 2000
-      }
-    }
-  }
-}
-- 
cgit v1.2.3