Merge pull request #5 from ksdeekshith/IBMZ_Support

QUAY-BUILDER-QEMU support on IBMZ

Author: Oleg Bulatov

.github/workflows/build-and-publish.yaml

@@ -36,13 +36,20 @@ jobs:
           username: ${{ secrets.QUAY_USER }}
           password: ${{ secrets.QUAY_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
         env:
           TAG: ${{ steps.version-from-branch.outputs.version }}${{ env.TAG_SUFFIX }}
         with:
-          build-args: channel=stable version=current
+          platforms: linux/amd64, linux/s390x
+          build-args: channel=stable
           push: true
           file: Dockerfile
           tags: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.event.inputs.tag || env.TAG }}

Dockerfile

@@ -1,19 +1,22 @@
-FROM centos:8 as base
+FROM quay.io/centos/centos:stream9 as base
 ARG channel="stable"
 ARG location
 
 RUN [ -z "${channel}" ] && echo "ARG channel is required" && exit 1 || true
 
 RUN yum -y install jq
-RUN curl https://builds.coreos.fedoraproject.org/streams/${channel}.json -o stable.json && \
-	cat stable.json | jq '.architectures.x86_64.artifacts.qemu.release' | tr -d '"'
+RUN ARCH=$(uname -m) ; echo $ARCH \
+	; curl https://builds.coreos.fedoraproject.org/streams/${channel}.json -o stable.json && \
+		cat stable.json | jq -r --arg arch "$ARCH" '.architectures[$arch].artifacts.qemu.release'
 
 
 FROM base AS executor-img
 
 RUN if [[ -z "$arg" ]] ; then \
-	echo "Downloading" $(cat stable.json | jq '.architectures.x86_64.artifacts.qemu.formats."qcow2.xz".disk.location' | tr -d '"') && \
-	curl -s -o coreos_production_qemu_image.qcow2.xz $(cat stable.json | jq '.architectures.x86_64.artifacts.qemu.formats."qcow2.xz".disk.location' | tr -d '"') && unxz coreos_production_qemu_image.qcow2.xz ; \
+	ARCH=$(uname -m) ; echo $ARCH ; \
+	echo "Downloading" $(cat stable.json | jq -r --arg arch "$ARCH" '.architectures[$arch].artifacts.qemu.formats."qcow2.xz".disk.location') && \
+	curl -s -o coreos_production_qemu_image.qcow2.xz $(cat stable.json | jq -r --arg arch "$ARCH" '.architectures[$arch].artifacts.qemu.formats."qcow2.xz".disk.location') && \
+		unxz coreos_production_qemu_image.qcow2.xz ; \
 	else \
 	echo "Downloading" ${location} && \
 	curl -s -o coreos_production_qemu_image.qcow2.xz ${location} && unxz coreos_production_qemu_image.qcow2.xz \

build.sh

@@ -4,12 +4,12 @@ set -o nounset
 TAG=${TAG:-"stable"}
 IMAGE=${IMAGE:-"quay.io/quay/quay-builder-qemu-fedoracoreos"}
 CLOUD_IMAGE=${CLOUD_IMAGE:-""}
+ARCH=$(uname -m)
 
 if [ -z "$CLOUD_IMAGE" ]; then
     CHANNEL=${CHANNEL:-"stable"}
     CHANNEL_MANIFEST_JSON=`curl https://builds.coreos.fedoraproject.org/streams/${CHANNEL}.json`
-    LOCATION=`echo $CHANNEL_MANIFEST_JSON | jq '.architectures.x86_64.artifacts.qemu.formats."qcow2.xz".disk.location' | tr -d '"'`
-    VERSION=`echo $CHANNEL_MANIFEST_JSON | jq '.architectures.x86_64.artifacts.qemu.release' | tr -d '"'`
+    LOCATION=`echo $CHANNEL_MANIFEST_JSON | jq -r --arg arch "$ARCH" '.architectures[$arch].artifacts.qemu.formats."qcow2.xz".disk.location'`
 
     time docker build --build-arg=channel=$CHANNEL --build-arg --build-arg -t $IMAGE:$TAG .
 else