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.

Sign up for GitHub

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 _cgo back #28

Merged
merged 1 commit into from
Oct 11, 2024
Merged

add _cgo back #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions patches/com_buildbarn_bb_storage/base_image.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index 7f3bade..1323c32 100644
+)
+use_repo(oci, "distroless_base")
diff --git tools/container.bzl tools/container.bzl
index e4aa679..6e92429 100644
index e4aa679..4900487 100644
--- tools/container.bzl
+++ tools/container.bzl
@@ -22,7 +22,7 @@ def multiarch_go_image(name, binary):
Expand All @@ -29,4 +29,21 @@ index e4aa679..6e92429 100644
+ base = Label("@distroless_base"),
entrypoint = ["/app/{}".format(native.package_relative_label(binary).name)],
tars = [tar_target],
# Don't build un-transitioned images, as the default target architecture might be unsupported
# Don't build un-transitioned images, as the default target architecture might be unsupported
@@ -32,7 +32,7 @@ def multiarch_go_image(name, binary):

for arch in ["amd64", "arm64"]:
arch_image_target = "{}_{}_image".format(name, arch)
- target_platform = "@rules_go//go/toolchain:linux_" + arch
+ target_platform = "@rules_go//go/toolchain:linux_" + arch + "_cgo"
images.append(arch_image_target)
platform_transition_filegroup(
name = arch_image_target,
@@ -49,6 +49,6 @@ def container_push_official(name, image, component):
oci_push(
name = name,
image = image,
- repository = "ghcr.io/buildbarn/" + component,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need this? I would have thought ghcr.io/buildbarn/bb_portal and ghcr.io/buildbarn/bb_portal_frontend would suffice

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

seems neater to me. maybe we can change frontend to match as well, ...but if you want to adjust in a subsequent PR I'm totally fine w/that.

+ repository = "ghcr.io/buildbarn/" + component + "/backend",
remote_tags = "@com_github_buildbarn_bb_storage//tools:stamped_tags",
)
Loading