Skip to content

K
k3s
Commit 99af0416 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45248 from ixdy/docker-bundle-rule

Automatic merge from submit-queue (batch tested with PRs 45283, 45289, 45248, 44295) Use docker_bundle rule from new rules_docker repo **What this PR does / why we need it**: switched to using the new `docker_bundle` rule from `rules_docker` instead of my patched `docker_build` rule. This also brings in some fixes for the docker rules that were missing from my fork. Additionally, I switched out the `git_repository` rules for `http_archive` rules, since that seems to be recommended by the bazel docs (and might be faster). Lastly, I updated the `pkg_tar` rules to use my patch, which doesn't prepend `./` to files inside the tarballs. This one should likely be merged upstream in the near future. I think this is the last of the changes necessary to have `bazel run //:ci-artifacts` working properly to support using bazel for e2e in CI. **Release note**: ```release-note NONE ```
parents 8be8f904 e231d428
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 31 deletions
WORKSPACE
View file @ 99af0416
git_repository( http_archive(
name = "io_bazel_rules_go", name = "io_bazel_rules_go",
commit = "805fd1566500997379806373feb05e138a4dfe28", sha256 = "a1cae429e9d591017421150e3173478c46c693bc594322c7fa7e6cb5f672ef59",
remote = "https://github.com/bazelbuild/rules_go.git", strip_prefix = "rules_go-805fd1566500997379806373feb05e138a4dfe28",
urls = ["https://github.com/bazelbuild/rules_go/archive/805fd1566500997379806373feb05e138a4dfe28.tar.gz"],
) )
git_repository( http_archive(
name = "io_kubernetes_build", name = "io_kubernetes_build",
commit = "684e550a2f006dbe3cf3b3d481d3f19217b228f7", sha256 = "1d146ccc034d3a9d8f5f02237144b78be135a0fb06935b37c745a2e7fcfecfed",
remote = "https://github.com/kubernetes/repo-infra.git", strip_prefix = "repo-infra-684e550a2f006dbe3cf3b3d481d3f19217b228f7",
urls = ["https://github.com/kubernetes/repo-infra/archive/684e550a2f006dbe3cf3b3d481d3f19217b228f7.tar.gz"],
) )
git_repository( # This contains a patch to not prepend ./ to tarfiles produced by pkg_tar.
# When merged upstream, we'll no longer need to use ixdy's fork:
# https://bazel-review.googlesource.com/#/c/10390/
http_archive(
name = "io_bazel", name = "io_bazel",
commit = "1fe52dd4b2d77a740648bc1509b68acae49deffc", sha256 = "667d32da016b1e2f63cf345cd3583989ec4a165034df383a01996d93635753a0",
remote = "https://github.com/ixdy/bazel.git", strip_prefix = "bazel-df2c687c22bdd7c76f3cdcc85f38fefd02f0b844",
urls = ["https://github.com/ixdy/bazel/archive/df2c687c22bdd7c76f3cdcc85f38fefd02f0b844.tar.gz"],
)
http_archive(
name = "io_bazel_rules_docker",
sha256 = "261fbd8fda1d06a12a0479019b46acd302c6aaa8df8e49383dc37917f20492a1",
strip_prefix = "rules_docker-52d9faf209ff6d16eb850b6b66d03483735e0633",
urls = ["https://github.com/bazelbuild/rules_docker/archive/52d9faf209ff6d16eb850b6b66d03483735e0633.tar.gz"],
) )
load("@io_bazel_rules_go//go:def.bzl", "go_repositories") load("@io_bazel_rules_go//go:def.bzl", "go_repositories")
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories")
go_repositories( go_repositories(
go_version = "1.8.1", go_version = "1.8.1",
) )
docker_repositories()
# for building docker base images # for building docker base images
debs = ( debs = (
( (
......
build/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@io_bazel//tools/build_defs/docker:docker.bzl", "docker_build") load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build", "docker_bundle")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
filegroup( filegroup(
...@@ -69,26 +69,13 @@ DOCKERIZED_BINARIES = { ...@@ -69,26 +69,13 @@ DOCKERIZED_BINARIES = {
}, },
} }
[genrule(
name = binary + "_docker_tag",
srcs = [meta["target"]],
outs = [binary + ".docker_tag"],
cmd = "grep ^STABLE_DOCKER_TAG bazel-out/stable-status.txt | awk '{print $$2}' >$@",
stamp = 1,
) for binary, meta in DOCKERIZED_BINARIES.items()]
[docker_build( [docker_build(
name = binary, 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,
], ],
image_tags = [
"@%s.docker_tag" % binary,
],
repository = "gcr.io/google_containers/" + binary,
repository_append_package = False,
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.
...@@ -96,6 +83,20 @@ DOCKERIZED_BINARIES = { ...@@ -96,6 +83,20 @@ DOCKERIZED_BINARIES = {
}, },
) for binary, meta in DOCKERIZED_BINARIES.items()] ) for binary, meta in DOCKERIZED_BINARIES.items()]
[docker_bundle(
name = binary,
images = {"gcr.io/google_containers/%s:{STABLE_DOCKER_TAG}" % binary: binary + "-internal"},
stamp = True,
) for binary in DOCKERIZED_BINARIES.keys()]
[genrule(
name = binary + "_docker_tag",
srcs = [meta["target"]],
outs = [binary + ".docker_tag"],
cmd = "grep ^STABLE_DOCKER_TAG bazel-out/stable-status.txt | awk '{print $$2}' >$@",
stamp = 1,
) for binary, meta in DOCKERIZED_BINARIES.items()]
release_filegroup( release_filegroup(
name = "docker-artifacts", name = "docker-artifacts",
srcs = [":%s.tar" % binary for binary in DOCKERIZED_BINARIES.keys()] + srcs = [":%s.tar" % binary for binary in DOCKERIZED_BINARIES.keys()] +
......
build/debs/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar", "pkg_deb") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar", "pkg_deb")
load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data") load("@io_kubernetes_build//defs:deb.bzl", "k8s_deb", "deb_data")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
......
build/release-tars/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
filegroup( filegroup(
......
cluster/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
licenses(["notice"]) licenses(["notice"])
......
cluster/addons/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
filegroup( filegroup(
name = "addon-srcs", name = "addon-srcs",
......
cluster/gce/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
load("@io_kubernetes_build//defs:build.bzl", "release_filegroup") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
pkg_tar( pkg_tar(
......
cluster/saltbase/BUILD
View file @ 99af0416
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
filegroup( filegroup(
name = "package-srcs", name = "package-srcs",
......
federation/BUILD
View file @ 99af0416
...@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) ...@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
licenses(["notice"]) licenses(["notice"])
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar") load("@io_bazel//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
filegroup( filegroup(
name = "package-srcs", name = "package-srcs",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment