Push multi-arch images (opendatahub-io#80)

* Exclude 32bit arm and s390x builds
* Use single workflow definition for pull-request and push event
* Delete pull-request-validation.yml
* Add layer caching
* Add TARGETARCH arg to Dockerfile

Signed-off-by: ddelange <[email protected]>

Author: ddelange

.github/workflows/build-and-push.yml

@@ -5,6 +5,7 @@ on:
     branches: [ main ]
     tags:
       - v*
+  pull_request:
 
 jobs:
   test:
@@ -20,29 +21,56 @@ jobs:
       run: sudo ./.github/install-etcd.sh
     - name: Build with Maven
       run: mvn -B package --file pom.xml
+
   build:
     needs: test
     runs-on: ubuntu-latest
+
     env:
       IMAGE_NAME: kserve/modelmesh
+
     steps:
-    - uses: actions/checkout@v2
-    - name: Build and push runtime image
-      run: |
-        GIT_COMMIT=$(git rev-parse HEAD)
-        BUILD_ID=$(date '+%Y%m%d')-$(git rev-parse HEAD | cut -c -5)
+      - uses: actions/checkout@v2
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        if: github.event_name == 'push'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Export version variables
+        run: |
+          GIT_COMMIT=$(git rev-parse HEAD)
+          BUILD_ID=$(date '+%Y%m%d')-$(git rev-parse HEAD | cut -c -5)
 
-        # Strip git ref prefix from version
-        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
 
-        # Use Docker `latest` tag convention
-        [ "$VERSION" == "main" ] && VERSION=latest
-        echo $VERSION
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
 
-        docker build -t ${{ env.IMAGE_NAME }}:$VERSION \
-          --build-arg imageVersion=$VERSION \
-          --build-arg buildId=${BUILD_ID} \
-          --build-arg commitSha=${GIT_COMMIT} .
+          echo "GIT_COMMIT=$GIT_COMMIT" >> $GITHUB_ENV
+          echo "BUILD_ID=$BUILD_ID" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-        docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_ACCESS_TOKEN }}
-        docker push ${{ env.IMAGE_NAME }}:$VERSION
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          # for linux/s390x, maven errors due to missing io.grpc:protoc-gen-grpc-java:exe:linux-s390_64:1.51.1
+          platforms: linux/amd64,linux/arm64/v8,linux/ppc64le
+          pull: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          push: ${{ github.event_name == 'push' }}
+          tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+          build-args: |
+            imageVersion=${{ env.VERSION }}
+            buildId=${{ env.BUILD_ID }}
+            commitSha=${{ env.GIT_COMMIT }}

.github/workflows/pull-request-validation.yml

@@ -14,6 +14,9 @@
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 as build_base
 
+# https://blog.thesparktree.com/docker-multi-arch-github-actions#architecture-specific-dockerfile-instructions
+ARG TARGETARCH=amd64
+
 ARG ETCD_VERSION=v3.5.4
 
 LABEL image="build_base"
@@ -33,9 +36,9 @@ RUN microdnf install wget tar gzip maven
 ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 
 # Install etcd -- used for CI tests
-RUN wget -q https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz && \
+RUN wget -q https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz && \
     mkdir -p /usr/lib/etcd && \
-    tar xzf etcd-*-linux-amd64.tar.gz -C /usr/lib/etcd --strip-components=1 --no-same-owner && \
+    tar xzf etcd-*-linux-${TARGETARCH}.tar.gz -C /usr/lib/etcd --strip-components=1 --no-same-owner && \
     rm -rf etcd*.gz
 
 ENV PATH="/usr/lib/etcd:$PATH"