github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #23040 from zhouhaibing089/addon_fix 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-17 05:18:41 -07:00
parent 53c6b35b71 884fbf3d22
commit b494cbc0c1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/common.sh
View File

@ -93,7 +93,7 @@ readonly GCS_STAGE="${LOCAL_OUTPUT_ROOT}/gcs-stage"
# Get the set of master binaries that run in Docker (on Linux) # Get the set of master binaries that run in Docker (on Linux)
# Entry format is "<name-of-binary>,<base-image>". # Entry format is "<name-of-binary>,<base-image>".
# Binaries are placed in /usr/local/bin inside the image. # Binaries are placed in /usr/local/bin inside the image.
# #
# $1 - server architecture # $1 - server architecture
kube::build::get_docker_wrapped_binaries() { kube::build::get_docker_wrapped_binaries() {
case $1 in case $1 in
@ -875,7 +875,10 @@ function kube::release::write_addon_docker_images_for_server() {
kube::log::status "Pulling and writing Docker image for addon: ${addon_path}" kube::log::status "Pulling and writing Docker image for addon: ${addon_path}"
local dest_name="${addon_path//\//\~}" local dest_name="${addon_path//\//\~}"
"${DOCKER[@]}" pull "${addon_path}" if [[ -z $("${DOCKER[@]}" images | awk '{print ($1":"$2)}' | grep "${addon_path}") ]]; then
kube::log::status "Addon image ${addon_path} does not exist, pulling it..."
"${DOCKER[@]}" pull "${addon_path}"
fi
"${DOCKER[@]}" save "${addon_path}" > "${1}/${dest_name}.tar" "${DOCKER[@]}" save "${addon_path}" > "${1}/${dest_name}.tar"
) & ) &
done done