-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
Dockerfile: update to debian bookworm #4410
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #4410 +/- ##
=======================================
Coverage 59.75% 59.75%
=======================================
Files 287 287
Lines 24821 24821
=======================================
Hits 14832 14832
Misses 9103 9103
Partials 886 886 |
# workaround for issue with llvm 11 for darwin/amd64 platform: | ||
# # github.com/docker/cli/cmd/docker | ||
# /usr/local/go/pkg/tool/linux_amd64/link: /usr/local/go/pkg/tool/linux_amd64/link: running strip failed: exit status 1 | ||
# llvm-strip: error: unsupported load command (cmd=0x5) | ||
# more info: https://github.com/docker/cli/pull/3717 | ||
# FIXME: remove once llvm 12 available on debian | ||
RUN [ "$TARGETPLATFORM" != "darwin/amd64" ] || ln -sfnT /bin/true /usr/bin/llvm-strip |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not required anymore (llvm 14 since bookworm)
# in bullseye arm64 target does not link with lld so configure it to use ld instead | ||
RUN [ ! -f /etc/alpine-release ] && xx-info is-cross && [ "$(xx-info arch)" = "arm64" ] && XX_CC_PREFER_LINKER=ld xx-clang --setup-target-triple || true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not required anymore
59df7c7
to
b6c736e
Compare
Dockerfile
Outdated
ARG BASE_DEBIAN_DISTRO=bookworm | ||
ARG BASE_ALPINE_VERSION=3.17 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious; was there a reason for renaming the arg? If there's no specific reason, I'd like to keep it the same (also consistent with the moby repo where we use ALPINE_VERSION
Also considering if we should use _VERSION
for debian as well, but I see we use BASE_DEBIAN_DISTRO
in moby.
Also can you put the alpine version above the debian version? I think we may update the alpine version more often, and having it "separate" from the GO_VERSION can potentially reduce conflicts when cherry-picking go version updates to release branches.
667f999
to
ebfc5a0
Compare
ebfc5a0
to
e0b70a5
Compare
Signed-off-by: CrazyMax <[email protected]>
Signed-off-by: CrazyMax <[email protected]>
e0b70a5
to
0d95231
Compare
I did a quick rebase to fix merge conflicts because of the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
removed them for now, but I'd like to add them back, so that (e.g.) "auto-merge" works as expected |
- What I did
Update to latest stable Debian distro (bookworm).
Also adds extra commit to use
debian
in stages instead of distro name. We need to update GitHub checks required (or just remove them imo):- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)