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

Merge pull request #19810 from spiffxp/empty-docker-opts-cp 

Support building on remote docker-machine instances
pull/6/head
Alex Mohr 2016-01-21 14:30:57 -08:00
parent 7d96694c3f d46a97224a
commit e98fb3c424
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/common.sh
View File

@ -624,8 +624,8 @@ function kube::build::copy_output() {
# Wait until binaries have finished coppying # Wait until binaries have finished coppying
count=0 count=0
while true;do while true;do
if docker "${DOCKER_OPTS}" cp "${KUBE_BUILD_CONTAINER_NAME}:/tmp/finished" "${LOCAL_OUTPUT_BINPATH}" > /dev/null 2>&1;then if "${DOCKER[@]}" cp "${KUBE_BUILD_CONTAINER_NAME}:/tmp/finished" "${LOCAL_OUTPUT_BINPATH}" > /dev/null 2>&1;then
docker "${DOCKER_OPTS}" cp "${KUBE_BUILD_CONTAINER_NAME}:/tmp/bin" "${LOCAL_OUTPUT_SUBPATH}" "${DOCKER[@]}" cp "${KUBE_BUILD_CONTAINER_NAME}:/tmp/bin" "${LOCAL_OUTPUT_SUBPATH}"
break; break;
fi fi
@ -833,8 +833,8 @@ 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}" "${DOCKER[@]}" pull "${addon_path}"
docker save "${addon_path}" > "${1}/${dest_name}.tar" "${DOCKER[@]}" save "${addon_path}" > "${1}/${dest_name}.tar"
) & ) &
done done
@ -843,8 +843,8 @@ function kube::release::write_addon_docker_images_for_server() {
kube::log::status "Building Docker python image" kube::log::status "Building Docker python image"
local img_name=python:2.7-slim-pyyaml local img_name=python:2.7-slim-pyyaml
docker build -t "${img_name}" "${KUBE_ROOT}/cluster/addons/python-image" "${DOCKER[@]}" build -t "${img_name}" "${KUBE_ROOT}/cluster/addons/python-image"
docker save "${img_name}" > "${1}/${img_name}.tar" "${DOCKER[@]}" save "${img_name}" > "${1}/${img_name}.tar"
) & ) &
fi fi
@ -1472,7 +1472,7 @@ function kube::release::docker::release() {
"amd64" "amd64"
) )
local docker_push_cmd=("docker") local docker_push_cmd=("${DOCKER[@]}")
if [[ "${KUBE_DOCKER_REGISTRY}" == "gcr.io/"* ]]; then if [[ "${KUBE_DOCKER_REGISTRY}" == "gcr.io/"* ]]; then
docker_push_cmd=("gcloud" "docker") docker_push_cmd=("gcloud" "docker")
fi fi