Fix vLLM image build workflow

Upstream docker files have been combined into a single file.

Author: sd109

.github/workflows/build-push-vllm-cpu.yml

@@ -14,14 +14,20 @@ on:
         required: true
 
 jobs:
-  build_push_x86_image:
+  build_push_image:
     name: Build and push image
     runs-on: ubuntu-latest
     permissions:
       contents: read
       id-token: write         # needed for signing the images with GitHub OIDC Token
       packages: write         # required for pushing container images
       security-events: write  # required for pushing SARIF files
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     steps:
       - name: Check out the vLLM repository
         uses: actions/checkout@v5
@@ -38,34 +44,6 @@ jobs:
 
       - name: Build and push image
         run: |
-          IMAGE=ghcr.io/stackhpc/vllm-cpu:${{ inputs.vllm_ref }}
-          docker build -f docker/Dockerfile.cpu -t $IMAGE --shm-size=4g .
-          docker push $IMAGE
-
-  build_push_arm64_image:
-    name: Build and push image
-    runs-on: ubuntu-24.04-arm
-    permissions:
-      contents: read
-      id-token: write         # needed for signing the images with GitHub OIDC Token
-      packages: write         # required for pushing container images
-      security-events: write  # required for pushing SARIF files
-    steps:
-      - name: Check out the vLLM repository
-        uses: actions/checkout@v5
-        with:
-          repository: vllm-project/vllm
-          ref: ${{ inputs.vllm_ref }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push image
-        run: |
-          IMAGE=ghcr.io/stackhpc/vllm-cpu:${{ inputs.vllm_ref }}-arm64
-          docker build -f docker/Dockerfile.arm -t $IMAGE --shm-size=4g .
+          IMAGE=ghcr.io/stackhpc/vllm-cpu:${{ inputs.vllm_ref }}${{ matrix.platform == 'linux/amd64' && '' || '-arm64' }}
+          docker buildx build --platform ${{ matrix.platform }} -f docker/Dockerfile.cpu -t $IMAGE --shm-size=4g .
           docker push $IMAGE