mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
build: bazel: release tars should use arch in the name
This commit is contained in:
parent
29669a5e21
commit
b6508bc9e8
10
build/BUILD
10
build/BUILD
@ -52,14 +52,8 @@ DOCKERIZED_BINARIES = {
|
||||
},
|
||||
}
|
||||
|
||||
# In the bash-based build (build/lib/release.sh), the images built for amd64 do not use
|
||||
# an arch in their name (but other arches do), and the GCE cluster scripts
|
||||
# (which sideload the images via tarfiles) expect there not to be an arch.
|
||||
# When pushing to gcr.io, we want to use an arch, since the archless name is now used for a
|
||||
# manifest list. Bazel doesn't support manifest lists (yet), so we can't do that either.
|
||||
# For now, we use the archless name for the image tars saved in the server tarball,
|
||||
# to satisfy GCE and other similar providers. (If one were to pull the images via the manifest
|
||||
# list, the arch wouldn't appear in the name either.)
|
||||
[multi_arch_container(
|
||||
name = binary,
|
||||
architectures = SERVER_PLATFORMS["linux"],
|
||||
@ -71,10 +65,8 @@ DOCKERIZED_BINARIES = {
|
||||
)),
|
||||
# Since the multi_arch_container macro replaces the {ARCH} format string,
|
||||
# we need to escape the stamping vars.
|
||||
# Also see comment above about why the push tags use ARCH while the
|
||||
# non-push tags do not.
|
||||
docker_push_tags = ["{{STABLE_DOCKER_PUSH_REGISTRY}}/%s-{ARCH}:{{STABLE_DOCKER_TAG}}" % binary],
|
||||
docker_tags = ["{{STABLE_DOCKER_REGISTRY}}/%s:{{STABLE_DOCKER_TAG}}" % binary],
|
||||
docker_tags = ["{{STABLE_DOCKER_REGISTRY}}/%s-{ARCH}:{{STABLE_DOCKER_TAG}}" % binary],
|
||||
stamp = True,
|
||||
symlinks = {
|
||||
# Some cluster startup scripts expect to find the binaries in /usr/local/bin,
|
||||
|
Loading…
Reference in New Issue
Block a user