-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Enable multi-platform support for bridge marker image builds
These changes enable building and pushing bridge marker container images for multiple platforms (amd64, s390x, arm64) from a single Dockerfile. Enhanced multi-platform support in the build process by adding a PLATFORMS argument in the Makefile for amd64, s390x, and arm64 architectures. Multi-platform build support is provided for both Docker and Podman container runtimes. Signed-off-by: Ashok Pariya <[email protected]>
- Loading branch information
1 parent
6f184fa
commit 022e5e2
Showing
6 changed files
with
173 additions
and
10 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 |
|---|---|---|
| @@ -1,4 +1,30 @@ | ||
| FROM registry.access.redhat.com/ubi8/ubi-minimal | ||
| COPY _output/bin/marker /marker | ||
| COPY _output/bin/.version /.version | ||
| ARG BUILD_ARCH=amd64 | ||
| FROM --platform=linux/${BUILD_ARCH} quay.io/centos/centos:stream9 AS builder | ||
| ARG TARGETOS | ||
| ARG TARGETARCH | ||
| ENV TARGETOS=${TARGETOS:-linux} | ||
| ENV TARGETARCH=${TARGETARCH:-amd64} | ||
|
|
||
| ARG BUILDOS | ||
| ARG BUILDARCH | ||
| ENV BUILDOS=${BUILDOS:-linux} | ||
| ENV BUILDARCH=${BUILDARCH:-amd64} | ||
|
|
||
| WORKDIR /go/src/bridge-marker | ||
| RUN dnf install -y wget && dnf clean all | ||
| COPY go.mod . | ||
| COPY go.sum . | ||
| RUN GO_VERSION=$(sed -En 's/^go +(.*)$/\1/p' go.mod) && \ | ||
| wget https://dl.google.com/go/go${GO_VERSION}.${BUILDOS}-${BUILDARCH}.tar.gz && \ | ||
| tar -C /usr/local -xzf go${GO_VERSION}.${BUILDOS}-${BUILDARCH}.tar.gz && \ | ||
| rm go${GO_VERSION}.${BUILDOS}-${BUILDARCH}.tar.gz | ||
|
|
||
| ENV PATH=$PATH:/usr/local/go/bin | ||
| RUN go mod download | ||
| COPY . . | ||
| RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o build/_output/bin/marker github.com/kubevirt/bridge-marker/cmd/marker | ||
|
|
||
| FROM --platform=linux/${TARGETARCH} registry.access.redhat.com/ubi8/ubi-minimal | ||
| COPY --from=builder /go/src/bridge-marker/build/_output/bin/marker /marker | ||
| COPY --from=builder /go/src/bridge-marker/build/_output/bin/.version /.version | ||
| ENTRYPOINT [ "/marker"] |
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,18 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [ -z "$ARCH" ] || [ -z "$PLATFORMS" ] || [ -z "$MARKER_IMAGE_TAGGED" ] || [ -z "$MARKER_IMAGE_GIT_TAGGED" ]; then | ||
| echo "Error: ARCH, PLATFORMS, MARKER_IMAGE_TAGGED, and MARKER_IMAGE_GIT_TAGGED must be set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| IFS=',' read -r -a PLATFORM_LIST <<< "$PLATFORMS" | ||
|
|
||
| BUILD_ARGS="--build-arg BUILD_ARCH=$ARCH -f build/Dockerfile -t $MARKER_IMAGE_TAGGED -t $MARKER_IMAGE_GIT_TAGGED . --push" | ||
|
|
||
| if [ ${#PLATFORM_LIST[@]} -eq 1 ]; then | ||
| docker build --platform "$PLATFORMS" $BUILD_ARGS | ||
| else | ||
| ./hack/init-buildx.sh "$DOCKER_BUILDER" | ||
| docker buildx build --platform "$PLATFORMS" $BUILD_ARGS | ||
| docker buildx rm "$DOCKER_BUILDER" 2>/dev/null || echo "Builder ${DOCKER_BUILDER} not found or already removed, skipping." | ||
| 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,23 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [ -z "$ARCH" ] || [ -z "$PLATFORMS" ] || [ -z "$MARKER_IMAGE_TAGGED" ]; then | ||
| echo "Error: ARCH, PLATFORMS, and MARKER_IMAGE_TAGGED must be set." | ||
| exit 1 | ||
| fi | ||
|
|
||
| IFS=',' read -r -a PLATFORM_LIST <<< "$PLATFORMS" | ||
|
|
||
| podman manifest rm "${MARKER_IMAGE_TAGGED}" 2>/dev/null || true | ||
| podman manifest rm "${MARKER_IMAGE_GIT_TAGGED}" 2>/dev/null || true | ||
| podman rmi "${MARKER_IMAGE_TAGGED}" 2>/dev/null || true | ||
| podman rmi "${MARKER_IMAGE_GIT_TAGGED}" 2>/dev/null || true | ||
|
|
||
| podman manifest create "${MARKER_IMAGE_TAGGED}" | ||
|
|
||
| for platform in "${PLATFORM_LIST[@]}"; do | ||
| podman build \ | ||
| --build-arg BUILD_ARCH="$ARCH" \ | ||
| --platform "$platform" \ | ||
| --manifest "${MARKER_IMAGE_TAGGED}" \ | ||
| -f build/Dockerfile . | ||
| done |
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,56 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| check_buildx() { | ||
| export DOCKER_CLI_EXPERIMENTAL=enabled | ||
|
|
||
| if ! docker buildx > /dev/null 2>&1; then | ||
| mkdir -p ~/.docker/cli-plugins | ||
| BUILDX_VERSION=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | jq -r .tag_name) | ||
| ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') | ||
| curl -L https://github.com/docker/buildx/releases/download/"${BUILDX_VERSION}"/buildx-"${BUILDX_VERSION}".linux-"${ARCH}" --output ~/.docker/cli-plugins/docker-buildx | ||
| chmod a+x ~/.docker/cli-plugins/docker-buildx | ||
| fi | ||
| } | ||
|
|
||
| create_or_use_buildx_builder() { | ||
| local builder_name=$1 | ||
| if [ -z "$builder_name" ]; then | ||
| echo "Error: Builder name is required." | ||
| exit 1 | ||
| fi | ||
|
|
||
| check_buildx | ||
|
|
||
| current_builder="$(docker buildx inspect "${builder_name}" 2>/dev/null)" || echo "Builder '${builder_name}' not found" | ||
|
|
||
| if ! grep -q "^Driver: docker$" <<<"${current_builder}" && \ | ||
| grep -q "linux/amd64" <<<"${current_builder}" && \ | ||
| grep -q "linux/arm64" <<<"${current_builder}" && \ | ||
| grep -q "linux/s390x" <<<"${current_builder}"; then | ||
| echo "The current builder already has multi-architecture support (amd64, arm64, s390x)." | ||
| echo "Skipping setup as the builder is already configured correctly." | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Check if the builder already exists by parsing the output of `docker buildx ls` | ||
| # We check if the builder_name appears in the list of active builders | ||
| existing_builder=$(docker buildx ls | grep -w "$builder_name" | awk '{print $1}') | ||
|
|
||
| if [ -n "$existing_builder" ]; then | ||
| echo "Builder '$builder_name' already exists." | ||
| echo "Using existing builder '$builder_name'." | ||
| docker buildx use "$builder_name" | ||
| else | ||
| echo "Creating a new Docker Buildx builder: $builder_name" | ||
| docker buildx create --driver-opt network=host --use --name "$builder_name" | ||
| echo "The new builder '$builder_name' has been created and set as active." | ||
| fi | ||
| } | ||
|
|
||
| if [ $# -eq 1 ]; then | ||
| create_or_use_buildx_builder "$1" | ||
| else | ||
| echo "Usage: $0 <builder_name>" | ||
| echo "Example: $0 mybuilder" | ||
| exit 1 | ||
| 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