Merge pull request #4 from rmohr/rules-docker-0.7

Update to rules_docker 0.7
rmohr · Mar 15, 2019 · 7ff37c2 · 7ff37c2
2 parents a5bcdf8 + 7dbd153
commit 7ff37c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -2,13 +2,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 
 http_archive(
     name = "io_bazel_rules_docker",
-    sha256 = "29d109605e0d6f9c892584f07275b8c9260803bf0c6fcb7de2623b2bedc910bd",
-    strip_prefix = "rules_docker-0.5.1",
-    urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.5.1.tar.gz"],
+    sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
+    strip_prefix = "rules_docker-0.7.0",
+    urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.7.0.tar.gz"],
 )
 
 load(
-    "@io_bazel_rules_docker//container:container.bzl",
+    "@io_bazel_rules_docker//repositories:repositories.bzl",
     container_repositories = "repositories",
 )
 

diff --git a/rpm/rpm.bzl b/rpm/rpm.bzl
@@ -46,7 +46,6 @@ _rpms_layer = rule(
     }.items()),
     executable = True,
     outputs = _container.image.outputs,
-    # TODO: rpm toolchain?
-    #toolchains = ["@io_bazel_rules_docker//toolchains/docker:toolchain_type"],
+    toolchains = ["@io_bazel_rules_docker//toolchains/docker:toolchain_type"],
     implementation = _rpms_impl,
 )