From 4109f9774881c7948606ca3a14f6398df3e1f313 Mon Sep 17 00:00:00 2001 From: Alexander Moriarty Date: Tue, 12 Oct 2021 14:43:40 -0700 Subject: [PATCH 1/2] [rules_docker] upstream change ReadImage https://github.com/bazelbuild/rules_docker/pull/1934 this fixes 670 --- k8s/go/pkg/resolver/resolver.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/k8s/go/pkg/resolver/resolver.go b/k8s/go/pkg/resolver/resolver.go index adaf0f2a..790ef3af 100644 --- a/k8s/go/pkg/resolver/resolver.go +++ b/k8s/go/pkg/resolver/resolver.go @@ -228,7 +228,8 @@ func (r *Resolver) publishSingle(spec imageSpec, stamper *compat.Stamper) (strin if err != nil { return "", fmt.Errorf("unable to determine parts of the image from the specified arguments: %v", err) } - img, err := compat.ReadImage(imgParts) + r := compat.Reader{Parts: imgParts} + img, err := r.ReadImage() if err != nil { return "", fmt.Errorf("error reading image: %v", err) } From 75c7ec110423c1b33acf220854d0ddeeec954595 Mon Sep 17 00:00:00 2001 From: Alexander Moriarty Date: Tue, 12 Oct 2021 15:17:11 -0700 Subject: [PATCH 2/2] [rules_docker] bump and pin to -> v0.20.0 Incoming upstream change: https://github.com/bazelbuild/rules_docker/pull/1934 --- k8s/k8s.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/k8s.bzl b/k8s/k8s.bzl index a26ed013..4867ac77 100644 --- a/k8s/k8s.bzl +++ b/k8s/k8s.bzl @@ -89,11 +89,11 @@ def k8s_repositories(): maybe( http_archive, name = "io_bazel_rules_docker", - sha256 = "efda18e39a63ee3c1b187b1349f61c48c31322bf84227d319b5dece994380bb6", - strip_prefix = "rules_docker-f929d80c5a4363994968248d87a892b1c2ef61d4", - # `master` as of 2021-04-25 + sha256 = "92779d3445e7bdc79b961030b996cb0c91820ade7ffa7edca69273f404b085d5", + strip_prefix = "rules_docker-0.20.0", + # release from 2021-10-11 urls = [ - "https://github.com/bazelbuild/rules_docker/archive/f929d80c5a4363994968248d87a892b1c2ef61d4.tar.gz", + "https://github.com/bazelbuild/rules_docker/releases/download/v0.20.0/rules_docker-v0.20.0.tar.gz", ], )