Skip to content

K
k3s
Commit 4db3cc7e authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

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

Fix docker load error in federation image push
parents bd0b94ef f9e32118
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
federation/cluster/common.sh
View file @ 4db3cc7e
...@@ -156,7 +156,7 @@ function push-federated-images { ...@@ -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}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment