Skip to content
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

Merged
merged 2 commits into from
Nov 23, 2023

Conversation

crazy-max
Copy link
Member

@crazy-max crazy-max commented Jul 10, 2023

- 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):

image

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter
Copy link

codecov-commenter commented Jul 10, 2023

Codecov Report

Merging #4410 (0d95231) into master (ce22ac2) will not change coverage.
The diff coverage is n/a.

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           

Comment on lines -31 to -40
# 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
Copy link
Member Author

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)

Comment on lines -66 to -70
# 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
Copy link
Member Author

Choose a reason for hiding this comment

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

Not required anymore

@crazy-max crazy-max marked this pull request as ready for review July 10, 2023 11:08
Dockerfile Outdated
Comment on lines 4 to 5
ARG BASE_DEBIAN_DISTRO=bookworm
ARG BASE_ALPINE_VERSION=3.17
Copy link
Member

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.

@crazy-max crazy-max force-pushed the update-bookworm branch 2 times, most recently from 667f999 to ebfc5a0 Compare July 15, 2023 12:48
@crazy-max crazy-max requested a review from thaJeztah July 15, 2023 12:49
@thaJeztah
Copy link
Member

I did a quick rebase to fix merge conflicts because of the --link we added in some places

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member

We need to update GitHub checks required (or just remove them imo):

removed them for now, but I'd like to add them back, so that (e.g.) "auto-merge" works as expected

@thaJeztah thaJeztah merged commit 1c6d7d0 into docker:master Nov 23, 2023
76 checks passed
@crazy-max crazy-max deleted the update-bookworm branch November 24, 2023 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants