github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 04:11:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69747 from ixdy/bazel-container-rules

Browse Source 
Bazel: stop using deprecated docker_ rules and turn on stamping
This commit is contained in:
k8s-ci-robot
2018-10-13 18:18:47 -07:00
committed by GitHub
parent e9066b848d c34cbb2f70
commit dad536b41f
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/BUILD
View File

@@ -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()]