Skip to content

Commit 0e65005

Browse files
authored
Merge pull request #323 from thaJeztah/docker_20.10.8
add workaround for non-static `ctr` binary in docker 20.10.8
2 parents 83e4de3 + 75e26ed commit 0e65005

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

20.10/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ FROM alpine:{{ .alpine }}
22

33
RUN apk add --no-cache \
44
ca-certificates \
5+
{{ if ["19.03", "19.03-rc", "20.10-rc"] | index(env.version) | not then ( -}}
6+
# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824
7+
libc6-compat \
8+
{{ ) else "" end -}}
59
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
610
openssh-client
711

0 commit comments

Comments
 (0)