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

Merge pull request #76457 from caesarxuchao/fix-image-build 

Follow up of #76126
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-12 12:57:16 -07:00 committed by GitHub
parent ee82a0127d 1b41803421
commit c48a16a6a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/image-util.sh
View File

@ -131,7 +131,7 @@ push() {
export DOCKER_CLI_EXPERIMENTAL="enabled" export DOCKER_CLI_EXPERIMENTAL="enabled"
# Make archs list into image manifest. Eg: 'amd64 ppc64le' to '${REGISTRY}/${IMAGE}-amd64:${TAG} ${REGISTRY}/${IMAGE}-ppc64le:${TAG}' # Make archs list into image manifest. Eg: 'amd64 ppc64le' to '${REGISTRY}/${IMAGE}-amd64:${TAG} ${REGISTRY}/${IMAGE}-ppc64le:${TAG}'
manifest=$(echo "$archs" | ${SED} -e "s~[^ ]*~$REGISTRY\/$IMAGE\-&:$TAG~g") manifest=$(echo "$archs" | ${SED} -e "s~[^ ]*~$REGISTRY\/$IMAGE\-&:$TAG~g")
docker manifest create --amend "${REGISTRY}/${IMAGE}:${TAG}" "${manifest}" docker manifest create --amend "${REGISTRY}/${IMAGE}:${TAG}" ${manifest}
for arch in ${archs}; do for arch in ${archs}; do
docker manifest annotate --arch "${arch}" "${REGISTRY}/${IMAGE}:${TAG}" "${REGISTRY}/${IMAGE}-${arch}:${TAG}" docker manifest annotate --arch "${arch}" "${REGISTRY}/${IMAGE}:${TAG}" "${REGISTRY}/${IMAGE}-${arch}:${TAG}"
done done