Adjust to OutputGroupInfo according to bazelbuild/bazel#7977

or-shachar · Jul 14, 2019 · f82c741 · f82c741
1 parent 5ef6b2b
commit f82c741
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/container/bundle.bzl b/container/bundle.bzl
@@ -81,6 +81,9 @@ def _container_bundle_impl(ctx):
             files = depset(),
             runfiles = ctx.runfiles(files = (stamp_files + runfiles)),
         ),
+        OutputGroupInfo(
+            tar = depset([attr.outputs.tar_output])
+        ),
     ]
 
 container_bundle_ = rule(
@@ -93,11 +96,9 @@ container_bundle_ = rule(
             default = False,
             mandatory = False,
         ),
+        "tar_output" = attr.output()
     }, _layer_tools),
     executable = True,
-    outputs = {
-        "out": "%{name}.tar",
-    },
     toolchains = ["@io_bazel_rules_docker//toolchains/docker:toolchain_type"],
     implementation = _container_bundle_impl,
 )
@@ -128,4 +129,7 @@ def container_bundle(**kwargs):
         kwargs["image_targets"] = values
         kwargs["image_target_strings"] = values
 
+    name = kwargs["name"]
+    tar_output = kwargs.pop("tar_output", name + ".tar")
+    kwargs["tar_output"] = tar_out
     container_bundle_(**kwargs)