Skip to content

Commit 4f2323a

Browse files
authored
Merge pull request #411 from infosiftr/23-no-compat
Ditch libc6-compat in 23+
2 parents 911ad9e + 2efbb5c commit 4f2323a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

20.10/cli/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

23.0/cli/Dockerfile

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

Dockerfile-cli.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ FROM alpine:3.17
33

44
RUN apk add --no-cache \
55
ca-certificates \
6-
# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824
6+
{{ if env.version | rtrimstr("-rc") == "20.10" then ( -}}
7+
# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824, https://github.com/docker-library/docker/issues/377
78
libc6-compat \
9+
{{ ) else "" end -}}
810
# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014
911
openssh-client
1012

0 commit comments

Comments
 (0)