diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 659d3a63c..a8d787fc9 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -8,6 +8,8 @@ FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/Dockerfile.template b/Dockerfile.template index 3b7dac846..455227b35 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -2,6 +2,10 @@ FROM alpine:{{ .alpine }} RUN apk add --no-cache \ ca-certificates \ +{{ if ["19.03", "19.03-rc", "20.10-rc"] | index(env.version) | not then ( -}} +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ +{{ ) else "" end -}} # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client