-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Multi-Arch Support for oci-registry builds and CI (#240)
* add multi-arch build support for build.sh script & update doc for new functionality Signed-off-by: Jordan Dubrick <[email protected]> * test new workflow for buildx Signed-off-by: Jordan Dubrick <[email protected]> * add multi arch script Signed-off-by: Jordan Dubrick <[email protected]> * add base repository Signed-off-by: Jordan Dubrick <[email protected]> * update ci to test both amd64 and arm64 image builds Signed-off-by: Jordan Dubrick <[email protected]> * add multi arch building stage for oci registry Signed-off-by: Jordan Dubrick <[email protected]> * add qemu for arm64 image building Signed-off-by: Jordan Dubrick <[email protected]> * add base tag for image Signed-off-by: Jordan Dubrick <[email protected]> * fix podman condition Signed-off-by: Jordan Dubrick <[email protected]> * pin login action to hash Signed-off-by: Jordan Dubrick <[email protected]> * make default manifest image a var Signed-off-by: Jordan Dubrick <[email protected]> * add troubleshooting section Signed-off-by: Jordan Dubrick <[email protected]> --------- Signed-off-by: Jordan Dubrick <[email protected]>
- Loading branch information
Showing
5 changed files
with
151 additions
and
12 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,17 +89,16 @@ jobs: | |
| steps: | ||
| - name: Check out registry support source code | ||
| uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 | ||
| - name: Build and push oci-registry docker image | ||
| uses: docker/[email protected] | ||
| - name: Set up QEMU # Enables arm64 image building | ||
| uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 #v3.0.0 | ||
| - name: Login to Quay.io | ||
| uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0 | ||
| with: | ||
| path: ./oci-registry | ||
| registry: quay.io | ||
| username: ${{ secrets.QUAY_USERNAME }} | ||
| password: ${{ secrets.QUAY_PASSWORD }} | ||
| registry: quay.io | ||
| repository: devfile/oci-registry | ||
| dockerfile: ./oci-registry/Dockerfile | ||
| tags: next | ||
| tag_with_sha: true | ||
| - name: Build and push oci-registry docker image | ||
| run: bash ./oci-registry/build-multi-arch.sh | ||
|
|
||
| devfileRegistryIntegrationBuild: | ||
| runs-on: ubuntu-latest | ||
|
|
||
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,81 @@ | ||
| #!/bin/sh | ||
|
|
||
| # | ||
| # Copyright Red Hat | ||
| # | ||
| # 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. | ||
|
|
||
| buildfolder="$(basename "$(dirname "$0")")" | ||
| # Due to command differences between podman and docker we need to separate the process | ||
| # for creating and adding images to a multi-arch manifest | ||
| podman=${USE_PODMAN:-false} | ||
| # Stores all created image tags | ||
| images=() | ||
| # Base Repository | ||
| BASE_REPO="quay.io/devfile/oci-registry" | ||
| BASE_TAG="next" | ||
| DEFAULT_MANIFEST="$BASE_REPO:$BASE_TAG" | ||
|
|
||
| function build { | ||
| IMAGE="$BASE_REPO:$2" | ||
|
|
||
| echo "Building: ${IMAGE}" | ||
| $1 build -t $IMAGE --platform "linux/$2" "$buildfolder" | ||
|
|
||
| echo "Tagging: ${IMAGE}" | ||
| $1 tag "$IMAGE" "$IMAGE" | ||
|
|
||
| echo "Pushing: ${IMAGE}" | ||
| $1 push "$IMAGE" | ||
|
|
||
| # Add image to list of all images to be added to a manifest | ||
| images+=("${IMAGE}") | ||
| } | ||
|
|
||
| function engine-handler { | ||
| for arch in amd64 arm64 ; do | ||
| build "$1" "$arch" | ||
| done | ||
| } | ||
|
|
||
|
|
||
| if [ ${podman} == true ]; then | ||
| echo "Executing with podman" | ||
|
|
||
| # Build and push multi-arch images | ||
| engine-handler podman | ||
|
|
||
| # Create manifest and add images | ||
| podman manifest create oci-registry-manifest | ||
| for img in "${images[@]}" ; do | ||
| podman manifest add oci-registry-manifest "$img" | ||
| done | ||
|
|
||
| # Push and delete local manifest | ||
| podman manifest push oci-registry-manifest "$DEFAULT_MANIFEST" | ||
| podman manifest rm oci-registry-manifest | ||
|
|
||
| else | ||
| echo "Executing with docker" | ||
|
|
||
| # Build and push multi-arch images | ||
| engine-handler docker | ||
|
|
||
| # Create manifest and add images | ||
| docker manifest create "$DEFAULT_MANIFEST" "${images[@]}" | ||
|
|
||
| # Push and delete local manifest | ||
| docker manifest push "$DEFAULT_MANIFEST" | ||
| docker manifest rm "$$DEFAULT_MANIFEST" | ||
|
|
||
| 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