Skip to content

Commit 6b688e8

Browse files
author
Trey Ivy
committed
add _cgo back
1 parent 90d60fa commit 6b688e8

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

patches/com_buildbarn_bb_storage/base_image.diff

+19-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ index 7f3bade..1323c32 100644
1818
+)
1919
+use_repo(oci, "distroless_base")
2020
diff --git tools/container.bzl tools/container.bzl
21-
index e4aa679..6e92429 100644
21+
index e4aa679..4900487 100644
2222
--- tools/container.bzl
2323
+++ tools/container.bzl
2424
@@ -22,7 +22,7 @@ def multiarch_go_image(name, binary):
@@ -29,4 +29,21 @@ index e4aa679..6e92429 100644
2929
+ base = Label("@distroless_base"),
3030
entrypoint = ["/app/{}".format(native.package_relative_label(binary).name)],
3131
tars = [tar_target],
32-
# Don't build un-transitioned images, as the default target architecture might be unsupported
32+
# Don't build un-transitioned images, as the default target architecture might be unsupported
33+
@@ -32,7 +32,7 @@ def multiarch_go_image(name, binary):
34+
35+
for arch in ["amd64", "arm64"]:
36+
arch_image_target = "{}_{}_image".format(name, arch)
37+
- target_platform = "@rules_go//go/toolchain:linux_" + arch
38+
+ target_platform = "@rules_go//go/toolchain:linux_" + arch + "_cgo"
39+
images.append(arch_image_target)
40+
platform_transition_filegroup(
41+
name = arch_image_target,
42+
@@ -49,6 +49,6 @@ def container_push_official(name, image, component):
43+
oci_push(
44+
name = name,
45+
image = image,
46+
- repository = "ghcr.io/buildbarn/" + component,
47+
+ repository = "ghcr.io/buildbarn/" + component + "/backend",
48+
remote_tags = "@com_github_buildbarn_bb_storage//tools:stamped_tags",
49+
)

0 commit comments

Comments
 (0)