switch to rules_img and add image amd64/v3 variant

Author: malt3

MODULE.bazel

@@ -13,10 +13,9 @@ bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "protobuf", version = "33.0")
 bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
 bazel_dep(name = "rules_go", version = "0.58.3")
+bazel_dep(name = "rules_img", version = "0.2.9")
 bazel_dep(name = "rules_jsonnet", version = "0.7.2")
 bazel_dep(name = "rules_nodejs", version = "6.6.0")
-bazel_dep(name = "rules_oci", version = "2.2.6")
-bazel_dep(name = "rules_pkg", version = "1.1.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_shell", version = "0.6.1")
 bazel_dep(name = "toolchains_llvm", version = "1.5.0")
@@ -154,19 +153,10 @@ npm.npm_translate_lock(
 )
 use_repo(npm, "com_github_buildbarn_bb_storage_npm")
 
-oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
-oci.pull(
+pull = use_repo_rule("@rules_img//img:pull.bzl", "pull")
+pull(
     name = "distroless_static",
     digest = "sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac",
-    image = "gcr.io/distroless/static",
-    platforms = [
-        "linux/amd64",
-        "linux/arm64/v8",
-    ],
-)
-use_repo(
-    oci,
-    "distroless_static",
-    "distroless_static_linux_amd64",
-    "distroless_static_linux_arm64_v8",
+    registry = "gcr.io",
+    repository = "distroless/static",
 )

MODULE.bazel.lock

@@ -1,57 +1,49 @@
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index", "oci_push")
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+load("@rules_img//img:layer.bzl", "image_layer")
+load("@rules_img//img:image.bzl", "image_manifest", "image_index")
+load("@rules_img//img:push.bzl", "image_push")
 
 def multiarch_go_image(name, binary):
     """Create a container image with two variants of the given go_binary target.
 
     Args:
-        name: resulting oci_image_index target
+        name: resulting image_index target
         binary: label of a go_binary target; it may be transitioned to another architecture
     """
 
     tar_target = "_{}.tar".format(name)
     image_target = "_{}.image".format(name)
 
-    pkg_tar(
+    image_layer(
         name = tar_target,
-        srcs = [binary],
-        include_runfiles = True,
-        package_dir = "app",
-        extension = "tar.gz",
+        srcs = {"app/{}".format(native.package_relative_label(binary).name): binary},
     )
 
-    oci_image(
+    image_manifest(
         name = image_target,
         base = Label("@distroless_static"),
         entrypoint = ["/app/{}".format(native.package_relative_label(binary).name)],
-        tars = [tar_target],
+        layers = [tar_target],
         # Don't build un-transitioned images, as the default target architecture might be unsupported
         # For example when building on linux-i386.
         tags = ["manual"],
     )
 
-    oci_image_index(
+    image_index(
         name = name,
-        images = [image_target],
+        manifests = [image_target],
         platforms = [
-            "@rules_go//go/toolchain:linux_amd64",
-            "@rules_go//go/toolchain:linux_arm64",
+            "//tools/platforms:linux_amd64",
+            "//tools/platforms:linux_amd64_v3",
+            "//tools/platforms:linux_arm64",
         ],
         visibility = ["//visibility:public"],
-        target_compatible_with = select({
-            Label("@platforms//os:windows"): [Label("@platforms//:incompatible")],
-            "//conditions:default": [],
-        }),
     )
 
 def container_push_official(name, image, component):
-    oci_push(
+    image_push(
         name = name,
         image = image,
-        repository = "ghcr.io/buildbarn/" + component,
-        remote_tags = "@com_github_buildbarn_bb_storage//tools:stamped_tags",
-        target_compatible_with = select({
-            Label("@platforms//os:windows"): [Label("@platforms//:incompatible")],
-            "//conditions:default": [],
-        }),
+        registry = "ghcr.io",
+        repository = "buildbarn/" + component,
+        tag_file = "@com_github_buildbarn_bb_storage//tools:stamped_tags",
     )

tools/container.bzl

@@ -0,0 +1,22 @@
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "linux_amd64",
+    actual = "@rules_go//go/toolchain:linux_amd64",
+)
+
+platform(
+    name = "linux_amd64_v3",
+    constraint_values = [
+        "@rules_go//go/constraints/amd64:v3",
+        "@rules_img//img/constraints/amd64:v3",
+    ],
+    parents = ["@rules_go//go/toolchain:linux_amd64"],
+)
+
+alias(
+    name = "linux_arm64",
+    actual = "@rules_go//go/toolchain:linux_arm64",
+)