Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c34cbb2f
Commit
c34cbb2f
authored
Oct 12, 2018
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bazel: stop using deprecated docker_ rules and turn on stamping
parent
c75d772c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
BUILD
build/BUILD
+4
-5
BUILD
cluster/images/hyperkube/BUILD
+4
-3
BUILD
cluster/images/kubemark/BUILD
+5
-3
No files found.
build/BUILD
View file @
c34cbb2f
package(default_visibility = ["//visibility:public"])
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_bundle", "container_image")
load("@io_bazel_rules_docker//container:container.bzl", "container_image")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
filegroup(
filegroup(
...
@@ -56,13 +55,14 @@ DOCKERIZED_BINARIES = {
...
@@ -56,13 +55,14 @@ DOCKERIZED_BINARIES = {
},
},
}
}
[
docker_build
(
[
container_image
(
name = binary + "-internal",
name = binary + "-internal",
base = meta["base"],
base = meta["base"],
cmd = ["/usr/bin/" + binary],
cmd = ["/usr/bin/" + binary],
debs = [
debs = [
"//build/debs:%s.deb" % binary,
"//build/debs:%s.deb" % binary,
],
],
stamp = True,
symlinks = {
symlinks = {
# Some cluster startup scripts expect to find the binaries in /usr/local/bin,
# Some cluster startup scripts expect to find the binaries in /usr/local/bin,
# but the debs install the binaries into /usr/bin.
# but the debs install the binaries into /usr/bin.
...
@@ -70,12 +70,11 @@ DOCKERIZED_BINARIES = {
...
@@ -70,12 +70,11 @@ DOCKERIZED_BINARIES = {
},
},
) for binary, meta in DOCKERIZED_BINARIES.items()]
) for binary, meta in DOCKERIZED_BINARIES.items()]
[
dock
er_bundle(
[
contain
er_bundle(
name = binary,
name = binary,
# TODO(thockin): remove the google_containers name after release 1.11.
# TODO(thockin): remove the google_containers name after release 1.11.
images = {
images = {
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
"k8s.gcr.io/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal",
},
},
stamp = True,
stamp = True,
) for binary in DOCKERIZED_BINARIES.keys()]
) for binary in DOCKERIZED_BINARIES.keys()]
...
...
cluster/images/hyperkube/BUILD
View file @
c34cbb2f
load("@io_bazel_rules_docker//
docker:docker.bzl", "docker_build", "docker_bundl
e")
load("@io_bazel_rules_docker//
container:container.bzl", "container_bundle", "container_imag
e")
docker_build
(
container_image
(
name = "hyperkube-internal",
name = "hyperkube-internal",
base = "@debian-hyperkube-base-amd64//image",
base = "@debian-hyperkube-base-amd64//image",
files = [
files = [
"//cmd/hyperkube",
"//cmd/hyperkube",
],
],
stamp = True,
symlinks = {
symlinks = {
"/%s" % path: "/hyperkube"
"/%s" % path: "/hyperkube"
for path in [
for path in [
...
@@ -25,7 +26,7 @@ docker_build(
...
@@ -25,7 +26,7 @@ docker_build(
},
},
)
)
dock
er_bundle(
contain
er_bundle(
name = "hyperkube",
name = "hyperkube",
images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
images = {"k8s.gcr.io/hyperkube-amd64:{STABLE_DOCKER_TAG}": "hyperkube-internal"},
stamp = True,
stamp = True,
...
...
cluster/images/kubemark/BUILD
View file @
c34cbb2f
package(default_visibility = ["//visibility:public"])
package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_docker//
docker:docker.bzl", "docker_build", "dock
er_push")
load("@io_bazel_rules_docker//
container:container.bzl", "container_image", "contain
er_push")
docker_build
(
container_image
(
name = "image",
name = "image",
base = "@official_busybox//image",
base = "@official_busybox//image",
entrypoint = ["/kubemark"],
entrypoint = ["/kubemark"],
files = ["//cmd/kubemark"],
files = ["//cmd/kubemark"],
stamp = True,
)
)
dock
er_push(
contain
er_push(
name = "push",
name = "push",
format = "Docker",
image = ":image",
image = ":image",
registry = "$(REGISTRY)",
registry = "$(REGISTRY)",
repository = "kubemark",
repository = "kubemark",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment