From c34cbb2f703654cfca335b015b8c3b1e5097702e Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Fri, 12 Oct 2018 13:16:38 -0700
Subject: [PATCH] Bazel: stop using deprecated docker_ rules and turn on
 stamping

---
 build/BUILD                    | 9 ++++-----
 cluster/images/hyperkube/BUILD | 7 ++++---
 cluster/images/kubemark/BUILD  | 8 +++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build/BUILD b/build/BUILD
index 0420d83346f..5f787a366be 100644
--- a/build/BUILD
+++ b/build/BUILD
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build", "docker_bundle")
-load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image")
 load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
 
 filegroup(
@@ -56,13 +55,14 @@ DOCKERIZED_BINARIES = {
     },
 }
 
-[docker_build(
+[container_image(
     name = binary + "-internal",
     base = meta["base"],
     cmd = ["/usr/bin/" + binary],
     debs = [
         "//build/debs:%s.deb" % binary,
     ],
+    stamp = True,
     symlinks = {
         # Some cluster startup scripts expect to find the binaries in /usr/local/bin,
         # but the debs install the binaries into /usr/bin.
@@ -70,12 +70,11 @@ DOCKERIZED_BINARIES = {
     },
 ) for binary, meta in DOCKERIZED_BINARIES.items()]
 
-[docker_bundle(
+[container_bundle(
     name = binary,
     # TODO(thockin): remove the google_containers name after release 1.11.
     images = {
         "k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
-        "gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
     },
     stamp = True,
 ) for binary in DOCKERIZED_BINARIES.keys()]
diff --git a/cluster/images/hyperkube/BUILD b/cluster/images/hyperkube/BUILD
index 9d77f735a2b..a3891749015 100644
--- a/cluster/images/hyperkube/BUILD
+++ b/cluster/images/hyperkube/BUILD
@@ -1,11 +1,12 @@
-load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build", "docker_bundle")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image")
 
-docker_build(
+container_image(
     name = "hyperkube-internal",
     base = "@debian-hyperkube-base-amd64//image",
     files = [
         "//cmd/hyperkube",
     ],
+    stamp = True,
     symlinks = {
         "/%s" % path: "/hyperkube"
         for path in [
@@ -25,7 +26,7 @@ docker_build(
     },
 )
 
-docker_bundle(
+container_bundle(
     name = "hyperkube",
     images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
     stamp = True,
diff --git a/cluster/images/kubemark/BUILD b/cluster/images/kubemark/BUILD
index b78d3af8cc3..b1eebb5542c 100644
--- a/cluster/images/kubemark/BUILD
+++ b/cluster/images/kubemark/BUILD
@@ -1,16 +1,18 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build", "docker_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
 
-docker_build(
+container_image(
     name = "image",
     base = "@official_busybox//image",
     entrypoint = ["/kubemark"],
     files = ["//cmd/kubemark"],
+    stamp = True,
 )
 
-docker_push(
+container_push(
     name = "push",
+    format = "Docker",
     image = ":image",
     registry = "$(REGISTRY)",
     repository = "kubemark",