From 30e81660fe46d2862bcbfe373b7b56dbcadb9a4a Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Wed, 27 Sep 2017 16:09:44 +0000 Subject: [PATCH] Upgrade to the latest version of rules_docker, which restructures the repository --- WORKSPACE | 10 +++++----- examples/hellogrpc/cc/server/BUILD | 2 +- examples/hellogrpc/go/server/BUILD | 2 +- examples/hellogrpc/java/server/BUILD | 2 +- examples/hellogrpc/py/server/BUILD | 2 +- examples/hellohttp/go/BUILD | 2 +- examples/hellohttp/java/BUILD | 2 +- k8s/object.bzl | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 44123a39..b1c46ee7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,7 +15,7 @@ workspace(name = "io_bazel_rules_k8s") git_repository( name = "io_bazel_rules_docker", - commit = "7fc2bd0338f2c866ebd6b5ec5c2b486e72d40ffd", + commit = "839a297d4e874216b4fd93f09dd35be5592dc10e", remote = "https://github.com/bazelbuild/rules_docker.git", ) @@ -82,7 +82,7 @@ java_proto_repositories() # We use cc_image to build a sample service load( - "@io_bazel_rules_docker//docker/contrib/cc:image.bzl", + "@io_bazel_rules_docker//cc:image.bzl", _cc_image_repos = "repositories", ) @@ -90,7 +90,7 @@ _cc_image_repos() # We use java_image to build a sample service load( - "@io_bazel_rules_docker//docker/contrib/java:image.bzl", + "@io_bazel_rules_docker//java:image.bzl", _java_image_repos = "repositories", ) @@ -111,7 +111,7 @@ go_repositories() # We use go_image to build a sample service load( - "@io_bazel_rules_docker//docker/contrib/go:image.bzl", + "@io_bazel_rules_docker//go:image.bzl", _go_image_repos = "repositories", ) @@ -146,7 +146,7 @@ pip_install() # We use py_image to build a sample service load( - "@io_bazel_rules_docker//docker/contrib/python:image.bzl", + "@io_bazel_rules_docker//python:image.bzl", _py_image_repos = "repositories", ) diff --git a/examples/hellogrpc/cc/server/BUILD b/examples/hellogrpc/cc/server/BUILD index 3811595b..3f07eaeb 100644 --- a/examples/hellogrpc/cc/server/BUILD +++ b/examples/hellogrpc/cc/server/BUILD @@ -15,7 +15,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 -load("@io_bazel_rules_docker//docker/contrib/cc:image.bzl", "cc_image") +load("@io_bazel_rules_docker//cc:image.bzl", "cc_image") cc_image( name = "server", diff --git a/examples/hellogrpc/go/server/BUILD b/examples/hellogrpc/go/server/BUILD index c3bebc3e..9421c631 100644 --- a/examples/hellogrpc/go/server/BUILD +++ b/examples/hellogrpc/go/server/BUILD @@ -13,7 +13,7 @@ # limitations under the License. package(default_visibility = ["//visibility:public"]) -load("@io_bazel_rules_docker//docker/contrib/go:image.bzl", "go_image") +load("@io_bazel_rules_docker//go:image.bzl", "go_image") load("@org_pubref_rules_protobuf//go:rules.bzl", "GRPC_COMPILE_DEPS") go_image( diff --git a/examples/hellogrpc/java/server/BUILD b/examples/hellogrpc/java/server/BUILD index 638df620..0bb37331 100644 --- a/examples/hellogrpc/java/server/BUILD +++ b/examples/hellogrpc/java/server/BUILD @@ -15,7 +15,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 -load("@io_bazel_rules_docker//docker/contrib/java:image.bzl", "java_image") +load("@io_bazel_rules_docker//java:image.bzl", "java_image") java_image( name = "server", diff --git a/examples/hellogrpc/py/server/BUILD b/examples/hellogrpc/py/server/BUILD index 2ce134b0..4f032b7d 100644 --- a/examples/hellogrpc/py/server/BUILD +++ b/examples/hellogrpc/py/server/BUILD @@ -16,7 +16,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 load("@examples_helloworld_pip//:requirements.bzl", "requirement") -load("@io_bazel_rules_docker//docker/contrib/python:image.bzl", "py_image") +load("@io_bazel_rules_docker//python:image.bzl", "py_image") py_image( name = "server", diff --git a/examples/hellohttp/go/BUILD b/examples/hellohttp/go/BUILD index bc645810..32da484e 100644 --- a/examples/hellohttp/go/BUILD +++ b/examples/hellohttp/go/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@io_bazel_rules_docker//docker/contrib/go:image.bzl", "go_image") +load("@io_bazel_rules_docker//go:image.bzl", "go_image") go_image( name = "server", diff --git a/examples/hellohttp/java/BUILD b/examples/hellohttp/java/BUILD index 14cbb7e7..4d0527e0 100644 --- a/examples/hellohttp/java/BUILD +++ b/examples/hellohttp/java/BUILD @@ -15,7 +15,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 -load("@io_bazel_rules_docker//docker/contrib/java:image.bzl", "war_image") +load("@io_bazel_rules_docker//java:image.bzl", "war_image") war_image( name = "server", diff --git a/k8s/object.bzl b/k8s/object.bzl index 0a7508af..0dc4014c 100644 --- a/k8s/object.bzl +++ b/k8s/object.bzl @@ -14,16 +14,16 @@ """An implementation of k8s_object for interacting with an object of kind.""" load( - "@io_bazel_rules_docker//docker:layers.bzl", + "@io_bazel_rules_docker//container:layers.bzl", _get_layers = "get_from_target", _layer_tools = "tools", ) load( - "@io_bazel_rules_docker//docker:label.bzl", + "@io_bazel_rules_docker//skylib:label.bzl", _string_to_label = "string_to_label", ) load( - "@io_bazel_rules_docker//docker:path.bzl", + "@io_bazel_rules_docker//skylib:path.bzl", _get_runfile_path = "runfile", )