From 53b0dc72c6aa92bd2d3ce177ad3c42f0f0d0bee9 Mon Sep 17 00:00:00 2001 From: Xin Gao Date: Fri, 8 Mar 2019 10:55:18 -0500 Subject: [PATCH 1/2] Fix attribute type for inputs. Per comment https://github.com/bazelbuild/rules_docker/pull/648/files#r263609718 --- container/image.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/image.bzl b/container/image.bzl index 2e750bf7d..b07d92411 100644 --- a/container/image.bzl +++ b/container/image.bzl @@ -229,7 +229,7 @@ def _assemble_image_digest(ctx, name, image, image_tarball, output_digest): ctx.actions.run( outputs = [output_digest], - tools = [image["config"]] + blobsums + blobs + + inputs = [image["config"]] + blobsums + blobs + ([image["legacy"]] if image.get("legacy") else []), executable = ctx.executable._digester, arguments = arguments, From 83554c7b37fd2c7a53f78fb2d64abd91c04d7b8a Mon Sep 17 00:00:00 2001 From: Xin Gao Date: Fri, 8 Mar 2019 11:23:17 -0500 Subject: [PATCH 2/2] buildifier --- container/image.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/image.bzl b/container/image.bzl index b07d92411..c67ccaae7 100644 --- a/container/image.bzl +++ b/container/image.bzl @@ -230,7 +230,7 @@ def _assemble_image_digest(ctx, name, image, image_tarball, output_digest): ctx.actions.run( outputs = [output_digest], inputs = [image["config"]] + blobsums + blobs + - ([image["legacy"]] if image.get("legacy") else []), + ([image["legacy"]] if image.get("legacy") else []), executable = ctx.executable._digester, arguments = arguments, mnemonic = "ImageDigest",