Merge pull request #6580 from concourse/default-to-containerd

concourse · Feb 26, 2021 · d208bdd · d208bdd
2 parents 64f76bb + ff447c6
commit d208bdd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -48,6 +48,8 @@ services:
     volumes: ["./hack/keys:/concourse-keys"]
     stop_signal: SIGUSR2
     environment:
+      CONCOURSE_RUNTIME: containerd
+
       CONCOURSE_TSA_PUBLIC_KEY: /concourse-keys/tsa_host_key.pub
       CONCOURSE_TSA_WORKER_PRIVATE_KEY: /concourse-keys/worker_key
 
@@ -61,4 +63,4 @@ services:
       CONCOURSE_BAGGAGECLAIM_DRIVER: overlay
 
       # work with docker-compose's dns
-      CONCOURSE_GARDEN_DNS_PROXY_ENABLE: "true"
+      CONCOURSE_CONTAINERD_DNS_PROXY_ENABLE: "true"
diff --git a/hack/overrides/containerd.yml b/hack/overrides/containerd.yml
diff --git a/hack/overrides/guardian.yml b/hack/overrides/guardian.yml
@@ -0,0 +1,12 @@
+# guardian.yml - a docker-compose override that makes `worker` use guardian as
+# a container runtime
+#
+#
+version: '3'
+
+services:
+  worker:
+    environment:
+      CONCOURSE_RUNTIME: guardian
+      CONCOURSE_CONTAINERD_DNS_PROXY_ENABLE: ~
+      CONCOURSE_GARDEN_DNS_PROXY_ENABLE: "true"