Skip to content

add workaround for non-static ctr binary in docker 20.10.8 #323

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

Merged
tianon merged 1 commit into from
Aug 4, 2021
Merged

add workaround for non-static ctr binary in docker 20.10.8 #323

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions 20.10/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ( -}}
Copy link
Copy Markdown
Member

@tianon tianon Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor nit that this should probably be env.version == "20.10", but it's harmless and the same either way, and hopefully temporary 😄

Copy link
Copy Markdown
Contributor Author

@thaJeztah thaJeztah Aug 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh! wrote this based on the existing example I found. didn't try other options, but yes, makes sense.

# 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

Expand Down