github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26396 from colhom/fix-federation-build

Browse Source 
Fix docker load error in federation image push
This commit is contained in:
Alex Robinson
2016-05-27 11:44:32 -07:00
parent bd0b94efe2 f9e32118dc
commit 4db3cc7e5e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
federation/cluster/common.sh
View File

@@ -156,7 +156,7 @@ function push-federated-images {
echo "Load: ${imageFile}" echo "Load: ${imageFile}"
# Load the image. Trust we know what it's called, as docker load provides no help there :( # Load the image. Trust we know what it's called, as docker load provides no help there :(
docker load -q < "${imageFile}" docker load < "${imageFile}"
local srcImageTag="$(cat ${imageFolder}/${binary}.docker_tag)" local srcImageTag="$(cat ${imageFolder}/${binary}.docker_tag)"
local dstImageTag="${FEDERATION_IMAGE_TAG:-$srcImageTag}" local dstImageTag="${FEDERATION_IMAGE_TAG:-$srcImageTag}"