Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Default to containerd in docker-compose.yml #6580

Merged
merged 1 commit into from
Feb 26, 2021
Merged

Default to containerd in docker-compose.yml #6580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"
13 changes: 0 additions & 13 deletions hack/overrides/containerd.yml
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions hack/overrides/guardian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"