From 050b244fa6518b83adb6ed82f0cb4c6b1228f7b6 Mon Sep 17 00:00:00 2001 From: Preston Van Loon <preston@prysmaticlabs.com> Date: Fri, 7 May 2021 12:38:22 -0500 Subject: [PATCH] Fix rules_docker dependency. See bazelbuild/rules_docker#1814 (#8867) Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- WORKSPACE | 8 +++----- third_party/rules_docker_bad_checksum.patch | 13 ------------- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 third_party/rules_docker_bad_checksum.patch diff --git a/WORKSPACE b/WORKSPACE index 61e09b469..c83e3b04e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -76,11 +76,9 @@ http_archive( http_archive( name = "io_bazel_rules_docker", - patch_args = ["-p1"], - patches = ["//third_party:rules_docker_bad_checksum.patch"], - sha256 = "1286175a94c0b1335efe1d75d22ea06e89742557d3fac2a0366f242a6eac6f5a", - strip_prefix = "rules_docker-ba4310833230294fa69b7d6ea1787ac684631a7d", - urls = ["https://github.com/bazelbuild/rules_docker/archive/ba4310833230294fa69b7d6ea1787ac684631a7d.tar.gz"], + sha256 = "59d5b42ac315e7eadffa944e86e90c2990110a1c8075f1cd145f487e999d22b3", + strip_prefix = "rules_docker-0.17.0", + urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.17.0/rules_docker-v0.17.0.tar.gz"], ) http_archive( diff --git a/third_party/rules_docker_bad_checksum.patch b/third_party/rules_docker_bad_checksum.patch deleted file mode 100644 index 04167862d..000000000 --- a/third_party/rules_docker_bad_checksum.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/repositories/go_repositories.bzl b/repositories/go_repositories.bzl -index 58054f7..12e93eb 100644 ---- a/repositories/go_repositories.bzl -+++ b/repositories/go_repositories.bzl -@@ -39,7 +39,7 @@ def go_deps(): - name = "com_github_google_go_containerregistry", - urls = ["https://api.github.com/repos/google/go-containerregistry/tarball/8a2841911ffee4f6892ca0083e89752fb46c48dd"], # v0.1.4 - strip_prefix = "google-go-containerregistry-8a28419", -- sha256 = "60b9a600affa5667bd444019a4e218b7752d8500cfa923c1ac54ce2f88f773e2", -+ sha256 = "cadb09cb5bcbe00688c73d716d1c9e774d6e4959abec4c425a1b995faf33e964", - importpath = "github.com/google/go-containerregistry", - type = "tar.gz", - ) \ No newline at end of file