chore: port #650 to 2.x

bazel-contrib · Jul 12, 2024 · 227ac26 · 227ac26
1 parent 4b843d6
commit 227ac26
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/docs/image.md b/docs/image.md
diff --git a/examples/assertion/big_image/BUILD.bazel b/examples/assertion/big_image/BUILD.bazel
@@ -85,6 +85,8 @@ N_LAYERS = 5
 oci_image(
     name = "extended",
     base = ":base",
+    # Tell Bazel to reserve more than the default 250MB of RAM for the OCIImage action
+    resource_set = "mem_8g",
     tags = ["manual"],
     tars = [":layer_%s" % i for i in range(N_LAYERS)],
 )
diff --git a/oci/private/BUILD.bazel b/oci/private/BUILD.bazel
@@ -32,6 +32,7 @@ bzl_library(
     ],
     deps = [
         ":util",
+        "@aspect_bazel_lib//lib:resource_sets",
         "@bazel_features//:features",
     ],
 )

diff --git a/oci/private/image.bzl b/oci/private/image.bzl
@@ -1,7 +1,8 @@
 "Implementation details for image rule"
 
+load("@aspect_bazel_lib//lib:resource_sets.bzl", "resource_set", "resource_set_attr")
 load("@bazel_features//:features.bzl", "bazel_features")
-load("//oci/private:util.bzl", "util")
+load("util.bzl", "util")
 
 _ACCEPTED_TAR_EXTENSIONS = [
     ".tar",
@@ -248,6 +249,7 @@ def _oci_image_impl(ctx):
         ],
         mnemonic = "OCIImage",
         progress_message = "OCI Image %{label}",
+        resource_set = resource_set(ctx.attr),
         toolchain = None,
     )
 
@@ -260,7 +262,7 @@ def _oci_image_impl(ctx):
 
 oci_image = rule(
     implementation = _oci_image_impl,
-    attrs = _attrs,
+    attrs = dict(_attrs, **resource_set_attr),
     doc = _DOC,
     toolchains = [
         "@aspect_bazel_lib//lib:jq_toolchain_type",