Skip to content
This repository has been archived by the owner on Feb 6, 2024. It is now read-only.

Upgrade to the latest version of rules_docker #42

Merged
merged 1 commit into from
Sep 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down Expand Up @@ -82,15 +82,15 @@ 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",
)

_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",
)

Expand All @@ -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",
)

Expand Down Expand Up @@ -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",
)

Expand Down
2 changes: 1 addition & 1 deletion examples/hellogrpc/cc/server/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/hellogrpc/go/server/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion examples/hellogrpc/java/server/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/hellogrpc/py/server/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/hellohttp/go/BUILD
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/hellohttp/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions k8s/object.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down