scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use munged semantic version for side-loaded docker tag

Browse Source
This commit is contained in:
Jeff Grafton
2017-04-26 16:52:52 -07:00
parent 963e056515
commit f73e3cbb30
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.bazel
View File

@@ -72,6 +72,6 @@ filegroup(
genrule( genrule(
name = "save_git_version", name = "save_git_version",
outs = ["version"], outs = ["version"],
cmd = "grep ^STABLE_BUILD_SCM_REVISION bazel-out/stable-status.txt | cut -d' ' -f2 >$@", cmd = "grep ^STABLE_BUILD_SCM_REVISION bazel-out/stable-status.txt | awk '{print $$2}' >$@",
stamp = 1, stamp = 1,
) )

11
build/BUILD
View File

@@ -1,7 +1,7 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@io_bazel//tools/build_defs/docker:docker.bzl", "docker_build") load("@io_bazel//tools/build_defs/docker:docker.bzl", "docker_build")
load("@io_kubernetes_build//defs:build.bzl", "md5sum", "release_filegroup") load("@io_kubernetes_build//defs:build.bzl", "release_filegroup")
filegroup( filegroup(
name = "package-srcs", name = "package-srcs",
@@ -63,9 +63,12 @@ DOCKERIZED_BINARIES = {
}, },
} }
[md5sum( [genrule(
name = binary + ".docker_tag", name = binary + "_docker_tag",
src = meta["target"], 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()] ) for binary, meta in DOCKERIZED_BINARIES.items()]
[docker_build( [docker_build(

15
build/lib/release.sh
View File

@@ -278,9 +278,12 @@ function kube::release::create_docker_images_for_server() {
kube::log::status "Starting Docker build for image: ${binary_name}" kube::log::status "Starting Docker build for image: ${binary_name}"
( (
local md5_sum # Docker tags cannot contain '+'
md5_sum=$(kube::release::md5 "${binary_dir}/${binary_name}") local docker_tag="${KUBE_GIT_VERSION/+/_}"
if [[ -z "${docker_tag}" ]]; then
kube::log::error "git version information missing; cannot create Docker tag"
return 1
fi
local docker_build_path="${binary_dir}/${binary_name}.dockerbuild" local docker_build_path="${binary_dir}/${binary_name}.dockerbuild"
local docker_file_path="${docker_build_path}/Dockerfile" local docker_file_path="${docker_build_path}/Dockerfile"
local binary_file_path="${binary_dir}/${binary_name}" local binary_file_path="${binary_dir}/${binary_name}"
@@ -292,15 +295,15 @@ function kube::release::create_docker_images_for_server() {
if [[ ${arch} == "amd64" ]]; then if [[ ${arch} == "amd64" ]]; then
# If we are building a amd64 docker image, preserve the original image name # If we are building a amd64 docker image, preserve the original image name
local docker_image_tag=gcr.io/google_containers/${binary_name}:${md5_sum} local docker_image_tag="gcr.io/google_containers/${binary_name}:${docker_tag}"
else else
# If we are building a docker image for another architecture, append the arch in the image tag # If we are building a docker image for another architecture, append the arch in the image tag
local docker_image_tag=gcr.io/google_containers/${binary_name}-${arch}:${md5_sum} local docker_image_tag="gcr.io/google_containers/${binary_name}-${arch}:${docker_tag}"
fi fi
"${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null "${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
"${DOCKER[@]}" save ${docker_image_tag} > ${binary_dir}/${binary_name}.tar "${DOCKER[@]}" save ${docker_image_tag} > ${binary_dir}/${binary_name}.tar
echo $md5_sum > ${binary_dir}/${binary_name}.docker_tag echo "${docker_tag}" > ${binary_dir}/${binary_name}.docker_tag
rm -rf ${docker_build_path} rm -rf ${docker_build_path}

1
hack/print-workspace-status.sh
View File

@@ -35,6 +35,7 @@ STABLE_BUILD_SCM_STATUS ${KUBE_GIT_TREE_STATE-}
STABLE_BUILD_SCM_REVISION ${KUBE_GIT_VERSION-} STABLE_BUILD_SCM_REVISION ${KUBE_GIT_VERSION-}
STABLE_BUILD_MAJOR_VERSION ${KUBE_GIT_MAJOR-} STABLE_BUILD_MAJOR_VERSION ${KUBE_GIT_MAJOR-}
STABLE_BUILD_MINOR_VERSION ${KUBE_GIT_MINOR-} STABLE_BUILD_MINOR_VERSION ${KUBE_GIT_MINOR-}
STABLE_DOCKER_TAG ${KUBE_GIT_VERSION/+/_}
gitCommit ${KUBE_GIT_COMMIT-} gitCommit ${KUBE_GIT_COMMIT-}
gitTreeState ${KUBE_GIT_TREE_STATE-} gitTreeState ${KUBE_GIT_TREE_STATE-}
gitVersion ${KUBE_GIT_VERSION-} gitVersion ${KUBE_GIT_VERSION-}