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

draft: feature: add bookworm 12 #1365

Closed

Conversation

maxjuhlke
Copy link

This feature will try to enable distroless 12.

This tries to re-implement:

#1146

@google-cla
Copy link

google-cla bot commented Jul 26, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@maxjuhlke maxjuhlke changed the title feature: add bookworm 12 draft: feature: add bookworm 12 Jul 26, 2023
@evanj
Copy link
Contributor

evanj commented Jul 27, 2023

Hey nice! I did some of the initial work for Debian 11 support in Distroless, so I just was checking in on this project to see if any progress has been made to add Debian 12 support. I'm glad to see there is interest in pushing this forward! I am not a maintainer, but I'll try to find some time to look at this PR. Thanks for doing this!

maxjuhlke and others added 2 commits July 27, 2023 17:12
…ess into feat/debian12-bookworm

Change since Google requires a CLA
@maxjuhlke
Copy link
Author

Hey @evanj , nice to see that there is interest in updating distroless to bookworm. I've done the CLA thingie, so this road-block should be out of the way.

I'll try to get a local bazel build working this weekend and might post some changes to this MR.

@@ -54,6 +59,8 @@ func (d Distro) Codename() string {
return "buster"
case DEBIAN11:
return "bullseye"
case DEBIAN12:
return "bullseye"

Choose a reason for hiding this comment

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

bookworm?

@@ -132,6 +135,8 @@ CC_VARIANTS = [
CC = {
"{REGISTRY}/{PROJECT_ID}/cc:{COMMIT_SHA}": "//cc:cc_root_amd64_debian11",
"{REGISTRY}/{PROJECT_ID}/cc-debian11:{COMMIT_SHA}": "//cc:cc_root_amd64_debian11",
"{REGISTRY}/{PROJECT_ID}/cc-debian12:{COMMIT_SHA}": "//cc:cc_root_amd64_debian12",

Copy link

Choose a reason for hiding this comment

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

I guess that this new line line will be breaking lint

fileContentTests:
- name: 'os-release contents'
path: '/etc/os-release'
expectedContents: ['.*\nVERSION="Debian GNU/Linux 12 \(bookworm\)"\n']
Copy link

Choose a reason for hiding this comment

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

should new line at end of file be added?

@@ -1,12 +1,11 @@
# debian 11
- distros: ["debian11"]
archs: ["amd64", "arm64", "arm", "s390x", "ppc64le"]
Copy link

Choose a reason for hiding this comment

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

This doesn't seem right.

Plenty of folks us using arm64 cpu. Also removing less common stuff like power pc without wide discussion seems to be wrong in my opinion. I'd bet maintainers would reject PR base on this change

@n0npax
Copy link

n0npax commented Aug 16, 2023

issue seems to be related to: #1337

@loosebazooka
Copy link
Member

thanks for working on this, I think we have this actually completed in #1385

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants