-
Notifications
You must be signed in to change notification settings - Fork 271
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Build and publish multi-arch images and manifest #3586
Merged
+183
−26
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
88f6340
build: use HOST_ARCHITECTURE in bazel-generate.sh
zhlhahaha 340de41
mulitarch build: migrate multi-arch build script
zhlhahaha 5beb80b
multiarch build: support build and push multiarch image and manifest
zhlhahaha 79ec60a
multiarch: setup multi-arch build process in automation
zhlhahaha File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # This file is part of the KubeVirt project | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| # Copyright 2023 NVIDIA CORPORATION | ||
| # | ||
|
|
||
| source hack/build/common.sh | ||
|
|
||
| COMMAND=$1 | ||
|
|
||
| build_count=$(echo ${BUILD_ARCH//,/ } | wc -w) | ||
|
|
||
| # Only add the tailing $arch when doing a multi-arch build | ||
| if [ "$build_count" -gt 1 ]; then | ||
| for arch in ${BUILD_ARCH//,/ }; do | ||
| echo "[INFO] -- working on $arch --" | ||
| arch=$(format_archname $arch) | ||
| tag=$(format_archname $arch tag) | ||
| DOCKER_TAG=$DOCKER_TAG-$tag ARCHITECTURE=$arch hack/build/bazel-${COMMAND}.sh | ||
| done | ||
| else | ||
| arch=$(format_archname ${BUILD_ARCH}) | ||
| ARCHITECTURE=${arch} hack/build/bazel-${COMMAND}.sh | ||
| fi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # This file is part of the KubeVirt project | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| # Copyright 2023 NVIDIA CORPORATION | ||
| # | ||
|
|
||
| source hack/build/common.sh | ||
|
|
||
| # No need to push manifests if using a single arch | ||
| build_count=$(echo ${BUILD_ARCH//,/ } | wc -w) | ||
| if [ "$build_count" -lt 2 ]; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| function podman_push_manifest() { | ||
| image=$1 | ||
| # FIXME: Workaround https://github.com/containers/podman/issues/18360 and remove once https://github.com/containers/podman/commit/bab4217cd16be609ac35ccf3061d1e34f787856f is released | ||
| echo ${CDI_CRI} manifest create ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} | ||
| ${CDI_CRI} manifest create ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} | ||
| for ARCH in ${BUILD_ARCH//,/ }; do | ||
| FORMATED_ARCH=$(format_archname ${ARCH}) | ||
| if [ ! -f ${DIGESTS_DIR}/${FORMATED_ARCH}/bazel-bin/push-$image.digest ]; then | ||
| continue | ||
| fi | ||
| digest=$(cat ${DIGESTS_DIR}/${FORMATED_ARCH}/bazel-bin/push-$image.digest) | ||
| ${CDI_CRI} manifest add ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} ${DOCKER_PREFIX}/${image}@${digest} | ||
| done | ||
| ${CDI_CRI} manifest push --all ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} | ||
| } | ||
|
|
||
| function docker_push_manifest() { | ||
| image=$1 | ||
| MANIFEST_IMAGES="" | ||
| for ARCH in ${BUILD_ARCH//,/ }; do | ||
| FORMATED_ARCH=$(format_archname ${ARCH}) | ||
| if [ ! -f ${DIGESTS_DIR}/${FORMATED_ARCH}/bazel-bin/push-$image.digest ]; then | ||
| continue | ||
| fi | ||
| digest=$(cat ${DIGESTS_DIR}/${FORMATED_ARCH}/bazel-bin/push-$image.digest) | ||
| MANIFEST_IMAGES="${MANIFEST_IMAGES} --amend ${DOCKER_PREFIX}/${image}@${digest}" | ||
| done | ||
| echo ${CDI_CRI} manifest create ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} ${MANIFEST_IMAGES} | ||
| ${CDI_CRI} manifest create ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} ${MANIFEST_IMAGES} | ||
| ${CDI_CRI} manifest push ${DOCKER_PREFIX}/${image}:${DOCKER_TAG} | ||
| } | ||
|
|
||
| export DOCKER_CLI_EXPERIMENTAL=enabled | ||
| for image in $(find ${DIGESTS_DIR}/*/bazel-bin/ -name '*.digest' -printf '%f\n' | sed s/^push-//g | sed s/\.digest$//g | sort -u); do | ||
| if [ "${CDI_CRI}" = "podman" ]; then | ||
| podman_push_manifest $image | ||
| else | ||
| docker_push_manifest $image | ||
| fi | ||
| done |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not blocking, but is this intentional? I believe we normally do copy right kubevirt authors.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just copy the file from kubevirt/kubevirt project and this is the copyright in the file:
https://github.com/kubevirt/kubevirt/blob/main/hack/multi-arch.sh
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a huge deal. I am fine with this.