Update rules_docker pin to pull in PR #559 (#229) * Update rules_docker pin to pull in PR #559 Pulls in the version that uses toolchain rules in the container image rule for the docker toolchain * Update base_images_docker with rules using toolchains fixed
diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl index 43cfe89..27b62e7 100644 --- a/repositories/repositories.bzl +++ b/repositories/repositories.bzl
@@ -58,9 +58,18 @@ if "io_bazel_rules_docker" not in excludes: http_archive( name = "io_bazel_rules_docker", - sha256 = "d9ee70d2f763ce197e2691f12d69ee8e32b2245a48d53b4365fa239b66405c0c", - strip_prefix = "rules_docker-7391b39ccad788524262e106d54adfdbfc3e44d5", - urls = ["https://github.com/bazelbuild/rules_docker/archive/7391b39ccad788524262e106d54adfdbfc3e44d5.tar.gz"], + sha256 = "f3e5c0500533d58be079db1a24ac909f2e0cd98c9d760f5e506e4d05b56c42dd", + strip_prefix = "rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba", + urls = ["https://github.com/bazelbuild/rules_docker/archive/a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz"], + ) + + # Register the docker toolchain type + native.register_toolchains( + # Register the default docker toolchain that expects the 'docker' + # executable to be in the PATH + "@io_bazel_rules_docker//toolchains/docker:default_linux_toolchain", + "@io_bazel_rules_docker//toolchains/docker:default_windows_toolchain", + "@io_bazel_rules_docker//toolchains/docker:default_osx_toolchain", ) # io_bazel_rules_go is the dependency of container_test rules. @@ -74,9 +83,9 @@ if "base_images_docker" not in excludes: http_archive( name = "base_images_docker", - sha256 = "1355ba2f4509409f3f57a4a4a03200b9431f0e37924950b02cc6955b691aee23", - strip_prefix = "base-images-docker-c4c3ff85458ce5dd3d93298559605d97fe948d17", - urls = ["https://github.com/GoogleCloudPlatform/base-images-docker/archive/c4c3ff85458ce5dd3d93298559605d97fe948d17.tar.gz"], + sha256 = "1bbc88e842c36d91074949b5f0eb49b55f7f71d81f2991e806f82342bfa01096", + strip_prefix = "base-images-docker-e0210a7d9dcff81f8c87019105bd6eb66e3df390", + urls = ["https://github.com/GoogleCloudPlatform/base-images-docker/archive/e0210a7d9dcff81f8c87019105bd6eb66e3df390.tar.gz"], ) if "distroless" not in excludes:
diff --git a/rules/container/docker_toolchains.bzl b/rules/container/docker_toolchains.bzl index b6e8964..3a405f1 100644 --- a/rules/container/docker_toolchains.bzl +++ b/rules/container/docker_toolchains.bzl
@@ -196,6 +196,7 @@ attrs = language_tool_layer_attrs, executable = True, outputs = _container.image.outputs, + toolchains = ["@io_bazel_rules_docker//toolchains/docker:toolchain_type"], implementation = _language_tool_layer_impl, ) @@ -302,6 +303,7 @@ }, executable = True, outputs = _container.image.outputs, + toolchains = ["@io_bazel_rules_docker//toolchains/docker:toolchain_type"], implementation = _toolchain_container_impl, )
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl index e9e1b7a..3784a9b 100644 --- a/rules/docker_config.bzl +++ b/rules/docker_config.bzl
@@ -325,6 +325,7 @@ "log": "%{name}.log", "output_tar": "%{name}_outputs.tar", }, + toolchains = ["@io_bazel_rules_docker//toolchains/docker:toolchain_type"], implementation = _docker_toolchain_autoconfig_impl, )