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

feat: migrate to bzlmod #1640

Merged
merged 10 commits into from
Sep 13, 2024
Merged

feat: migrate to bzlmod #1640

merged 10 commits into from
Sep 13, 2024

Conversation

thesayyn
Copy link
Collaborator

@thesayyn thesayyn commented Aug 9, 2024

Migrating to bzlmod, needs GoogleContainerTools/rules_distroless#70 first.

@loosebazooka
Copy link
Member

I think the node references are gone?

@thesayyn
Copy link
Collaborator Author

thesayyn commented Aug 9, 2024

I think the node references are gone?

no those went into private/extensions/

@loosebazooka
Copy link
Member

@thesayyn
Copy link
Collaborator Author

thesayyn commented Aug 9, 2024

oh I see, well maybe a name got mangled? : https://github.com/GoogleContainerTools/distroless/actions/runs/10311366649/job/28544819823?pr=1640#step:6:57

right, there was an issue in the extension, fixed now.

Copy link
Contributor

github-actions bot commented Aug 9, 2024

🌳 🔄 Image Check

This pull request has modified the following images:

//base:static_root_amd64_debian12
//base:static_debug_root_amd64_debian12
//base:static_nonroot_arm64_debian12
//base:static_nonroot_arm_debian12
//base:static_debug_root_arm_debian12
//base:static_nonroot_s390x_debian12
//base:static_debug_root_ppc64le_debian12
//base:static_debug_nonroot_ppc64le_debian12
//base:static_root_arm_debian12
//base:base_root_amd64_debian12
//base:static_debug_root_arm64_debian12
//base:static_root_s390x_debian12
//base:base_root_arm64_debian12
//base:static_nonroot_amd64_debian12
//base:debug_nonroot_arm64_debian12
//base:debug_nonroot_amd64_debian12
//base:base_nonroot_amd64_debian12
//base:base_nonroot_arm64_debian12
//base:base_root_arm_debian12
//base:static_debug_nonroot_s390x_debian12
//base:debug_root_arm_debian12
//base:debug_root_amd64_debian12
//base:base_nonroot_s390x_debian12
//base:base_root_s390x_debian12
//base:static_nonroot_ppc64le_debian12
//base:static_debug_nonroot_arm64_debian12
//base:debug_nonroot_arm_debian12
//base:debug_root_ppc64le_debian12
//base:base_nonroot_ppc64le_debian12
//base:base_nonroot_arm_debian12
//base:debug_root_s390x_debian12
//base:base_nossl_root_amd64_debian12
//base:base_root_ppc64le_debian12
//base:base_nossl_root_arm64_debian12
//base:base_nossl_nonroot_arm64_debian12
//base:base_nossl_nonroot_amd64_debian12
//base:debug_nonroot_ppc64le_debian12
//base:base_nossl_root_arm_debian12
//base:static_root_ppc64le_debian12
//base:static_debug_root_s390x_debian12
//base:static_root_arm64_debian12
//base:base_nossl_debug_root_arm_debian12
//base:debug_nonroot_s390x_debian12
//base:base_nossl_debug_nonroot_amd64_debian12
//base:static_debug_nonroot_amd64_debian12
//base:base_nossl_debug_nonroot_arm64_debian12
//base:base_nossl_nonroot_s390x_debian12
//base:base_nossl_debug_root_amd64_debian12
//base:base_nossl_nonroot_ppc64le_debian12
//base:debug_root_arm64_debian12
//base:base_nossl_debug_nonroot_s390x_debian12
//base:base_nossl_debug_root_s390x_debian12
//cc:debug_nonroot_amd64_debian12
//base:static_debug_nonroot_arm_debian12
//cc:cc_nonroot_arm64_debian12
//cc:cc_nonroot_amd64_debian12
//base:base_nossl_root_s390x_debian12
//cc:cc_root_amd64_debian12
//cc:debug_root_amd64_debian12
//base:base_nossl_debug_nonroot_ppc64le_debian12
//cc:cc_root_s390x_debian12
//base:base_nossl_debug_nonroot_arm_debian12
//base:base_nossl_nonroot_arm_debian12
//cc:debug_root_arm64_debian12
//base:base_nossl_debug_root_ppc64le_debian12
//cc:debug_root_arm_debian12
//cc:debug_nonroot_arm_debian12
//base:base_nossl_debug_root_arm64_debian12
//cc:debug_nonroot_ppc64le_debian12
//cc:cc_nonroot_ppc64le_debian12
//python3:python3_root_amd64_debian12
//python3:python3_nonroot_amd64_debian12
//cc:cc_nonroot_s390x_debian12
//cc:debug_root_s390x_debian12
//base:base_nossl_root_ppc64le_debian12
//cc:cc_root_arm64_debian12
//cc:cc_nonroot_arm_debian12
//cc:cc_root_ppc64le_debian12
//python3:debug_nonroot_amd64_debian12
//python3:debug_root_arm64_debian12
//python3:debug_nonroot_arm64_debian12
//cc:debug_root_ppc64le_debian12
//nodejs:nodejs18_debug_nonroot_amd64_debian12
//cc:debug_nonroot_arm64_debian12
//python3:python3_nonroot_arm64_debian12
//python3:debug_root_amd64_debian12
//nodejs:nodejs18_root_amd64_debian12
//nodejs:nodejs20_nonroot_amd64_debian12
//cc:cc_root_arm_debian12
//nodejs:nodejs22_debug_root_amd64_debian12
//nodejs:nodejs22_root_amd64_debian12
//nodejs:nodejs22_debug_nonroot_amd64_debian12
//cc:debug_nonroot_s390x_debian12
//nodejs:nodejs18_nonroot_amd64_debian12
//nodejs:nodejs20_debug_root_amd64_debian12
//nodejs:nodejs20_debug_nonroot_amd64_debian12
//nodejs:nodejs22_root_arm64_debian12
//python3:python3_root_arm64_debian12
//nodejs:nodejs18_debug_root_arm64_debian12
//nodejs:nodejs18_nonroot_arm_debian12
//nodejs:nodejs20_nonroot_arm64_debian12
//nodejs:nodejs18_nonroot_arm64_debian12
//nodejs:nodejs18_debug_root_amd64_debian12
//nodejs:nodejs18_debug_root_arm_debian12
//nodejs:nodejs20_root_arm_debian12
//nodejs:nodejs20_root_amd64_debian12
//nodejs:nodejs22_debug_root_arm64_debian12
//nodejs:nodejs18_root_arm_debian12
//nodejs:nodejs18_debug_nonroot_arm_debian12
//nodejs:nodejs20_debug_root_arm_debian12
//nodejs:nodejs20_nonroot_arm_debian12
//nodejs:nodejs22_root_arm_debian12
//nodejs:nodejs18_root_s390x_debian12
//nodejs:nodejs22_nonroot_amd64_debian12
//nodejs:nodejs18_debug_root_s390x_debian12
//nodejs:nodejs20_debug_nonroot_arm_debian12
//nodejs:nodejs18_debug_nonroot_arm64_debian12
//nodejs:nodejs20_debug_nonroot_arm64_debian12
//nodejs:nodejs20_nonroot_s390x_debian12
//nodejs:nodejs18_debug_nonroot_s390x_debian12
//nodejs:nodejs18_root_arm64_debian12
//nodejs:nodejs22_nonroot_arm_debian12
//nodejs:nodejs20_debug_nonroot_s390x_debian12
//nodejs:nodejs22_nonroot_s390x_debian12
//nodejs:nodejs18_debug_root_ppc64le_debian12
//nodejs:nodejs20_root_s390x_debian12
//nodejs:nodejs20_root_arm64_debian12
//nodejs:nodejs22_debug_nonroot_arm_debian12
//nodejs:nodejs18_root_ppc64le_debian12
//nodejs:nodejs22_debug_nonroot_arm64_debian12
//nodejs:nodejs20_nonroot_ppc64le_debian12
//nodejs:nodejs20_debug_root_arm64_debian12
//nodejs:nodejs22_nonroot_arm64_debian12
//nodejs:nodejs18_nonroot_s390x_debian12
//nodejs:nodejs22_nonroot_ppc64le_debian12
//nodejs:nodejs20_debug_nonroot_ppc64le_debian12
//nodejs:nodejs20_debug_root_ppc64le_debian12
//nodejs:nodejs22_debug_root_ppc64le_debian12
//nodejs:nodejs18_debug_nonroot_ppc64le_debian12
//java:java_base_debug_root_amd64_debian12
//nodejs:nodejs22_debug_nonroot_ppc64le_debian12
//java:java_base_nonroot_arm64_debian12
//nodejs:nodejs22_debug_root_s390x_debian12
//java:java_base_nonroot_s390x_debian12
//java:java_base_debug_nonroot_arm64_debian12
//java:java_base_nonroot_amd64_debian12
//nodejs:nodejs22_root_ppc64le_debian12
//java:java_base_root_amd64_debian12
//nodejs:nodejs22_root_s390x_debian12
//java:java_base_root_ppc64le_debian12
//java:java_base_debug_root_ppc64le_debian12
//nodejs:nodejs18_nonroot_ppc64le_debian12
//nodejs:nodejs22_debug_root_arm_debian12
//java:java17_debug_root_amd64_debian12
//java:java_base_root_arm64_debian12
//java:java_base_debug_root_s390x_debian12
//java:java_base_debug_nonroot_amd64_debian12
//java:java17_root_amd64_debian12
//nodejs:nodejs20_root_ppc64le_debian12
//java:java17_root_arm64_debian12
//java:java_base_root_s390x_debian12
//java:java_base_nonroot_ppc64le_debian12
//java:java17_root_s390x_debian12
//java:java17_root_ppc64le_debian12
//java:java_base_debug_root_arm64_debian12
//nodejs:nodejs22_debug_nonroot_s390x_debian12
//java:java_base_debug_nonroot_s390x_debian12
//java:java17_nonroot_amd64_debian12
//java:java17_debug_root_arm64_debian12
//java:java17_debug_nonroot_ppc64le_debian12
//java:java_base_debug_nonroot_ppc64le_debian12
//java:java17_debug_nonroot_amd64_debian12
//java:java17_nonroot_s390x_debian12
//java:java21_nonroot_amd64_debian12
//java:java21_nonroot_arm64_debian12
//java:java21_debug_root_amd64_debian12
//java:java21_nonroot_ppc64le_debian12
//java:java17_nonroot_ppc64le_debian12
//java:java21_debug_nonroot_amd64_debian12
//java:java17_debug_root_s390x_debian12
//java:java21_debug_nonroot_ppc64le_debian12
//java:java21_debug_nonroot_arm64_debian12
//java:java17_debug_nonroot_s390x_debian12
//java:java17_debug_nonroot_arm64_debian12
//java:java21_root_arm64_debian12
//java:java21_root_amd64_debian12
//nodejs:nodejs20_debug_root_s390x_debian12
//java:java17_nonroot_arm64_debian12
//java:java21_root_ppc64le_debian12
//java:java21_debug_root_arm64_debian12
//java:java21_debug_root_ppc64le_debian12
//java:java17_debug_root_ppc64le_debian12

You can check the details in the report here

@thesayyn
Copy link
Collaborator Author

@loosebazooka this is ready now.

@thesayyn
Copy link
Collaborator Author

cc @alexeagle as he promised to review.

@loosebazooka
Copy link
Member

oh shoot, I merged something in that probs needs a rebase+fix

@@ -1,9 +1,99 @@
"repositories for nodejs"
"node"
Copy link
Member

Choose a reason for hiding this comment

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

@omBratteng fyi, if you are updating node packages they are now in private/extensions/node.bzl

Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@omBratteng
Copy link
Contributor

You are receiving this because you are subscribed to this thread.

🙊

@loosebazooka
Copy link
Member

@thesayyn needs a rebase?

@mortenmj
Copy link

mortenmj commented Sep 2, 2024

There are some assumptions in this implementation that make it hard to import this in a downstream module. Will that be supported later?

@loosebazooka
Copy link
Member

There are some assumptions in this implementation that make it hard to import this in a downstream module. Will that be supported later?

I think fundamentally we dont want anyone importing distroless as a downstream module. If you wish to build distroless style images -- rules_distroless is what you need? What exactly is your usecase? Are there pieces in here that need to move into rules_distroless?

@thesayyn
Copy link
Collaborator Author

thesayyn commented Sep 6, 2024

@thesayyn needs a rebase?

finally got around to rebase. it should be ready now. i can't confirm scripts/update_java_archives.sh works because it fails on a darwin bash...

@loosebazooka
Copy link
Member

I can update the script for Java later

Comment on lines 46 to 48
exit 1


Copy link
Member

Choose a reason for hiding this comment

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

this looks like a debug exit that was left in here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

oh yes...

@loosebazooka
Copy link
Member

looks like the image diffs (non-java) are mostly just related to: GoogleContainerTools/rules_distroless#71

@loosebazooka
Copy link
Member

java versions need to be sync'd, there was an update here: #1649

Signed-off-by: Appu Goundan <[email protected]>
@loosebazooka loosebazooka merged commit fcacaeb into main Sep 13, 2024
9 checks passed
@loosebazooka loosebazooka deleted the bzlmod branch September 13, 2024 12:47
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.

4 participants