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

Add Debian 12 (bookworm) images #1385

Merged
merged 6 commits into from
Aug 28, 2023

Conversation

dahu33
Copy link
Contributor

@dahu33 dahu33 commented Aug 23, 2023

An attempt to fix #1337 and might supersede #1365

Requires #1384 to build on a fresh setup.

This builds base, static, base-nossl and cc images. Happy to work on the other targets after feedback from maintainers.

Copy link
Member

@loosebazooka loosebazooka left a comment

Choose a reason for hiding this comment

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

Thanks this looks pretty good, just some minor things.

base/base.bzl Outdated
@@ -119,7 +119,7 @@ def distro_components(distro):
base = ":static_" + user + "_" + arch + "_" + distro,
tars = [
deb_pkg(arch, distro, "libc6"),
deb_pkg(arch, distro, "libssl1.1"),
deb_pkg(arch, distro, "libssl1.1" if distro == "debian11" else "libssl3"),
deb_pkg(arch, distro, "openssl"),
Copy link
Member

Choose a reason for hiding this comment

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

I would prefer we remove openssl from debian12 images. It can be available in debug

cc/BUILD Outdated
@@ -10,6 +10,9 @@ DISTRO_DEBS = {
"debian11": [
Copy link
Member

Choose a reason for hiding this comment

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

if there are the same, just put them in the tars section. I feel like this might be remnants from debian10 days, and doesn't appear to be necessary anymore.

locale/locale.bzl Show resolved Hide resolved
README.md Show resolved Hide resolved
@dahu33
Copy link
Contributor Author

dahu33 commented Aug 25, 2023

Thanks this looks pretty good, just some minor things.

Thanks, addressed all your feedback, could you please have another look?

Copy link
Member

@loosebazooka loosebazooka left a comment

Choose a reason for hiding this comment

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

Looks like one test is failing, but there's also a minor documentation issue. otherwise lgtm.

README.md Show resolved Hide resolved
BUILD Show resolved Hide resolved
@dahu33 dahu33 requested a review from loosebazooka August 28, 2023 14:57
Copy link
Member

@loosebazooka loosebazooka left a comment

Choose a reason for hiding this comment

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

Awesome, thanks for contributing!

@loosebazooka loosebazooka merged commit 0a8f775 into GoogleContainerTools:main Aug 28, 2023
@Sineaggi
Copy link
Contributor

Would love to see the java targets added as well.

@loosebazooka
Copy link
Member

I think the language targets will be added slowly as we roll this out gradually.

@dahu33
Copy link
Contributor Author

dahu33 commented Aug 29, 2023

@loosebazooka thanks for the quick review!

Would love to see the java targets added as well.

@Sineaggi working on it, will see if I can get it out this week.

@SanjayVas SanjayVas mentioned this pull request Sep 12, 2023
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.

Debian 12 Support
3 participants