From 6cb29c7f9a509e738564c4c3faed52150b63ec0b Mon Sep 17 00:00:00 2001
From: Illia Vysochyn <ivysochyn@antmicro.com>
Date: Tue, 9 Jul 2024 13:24:41 +0200
Subject: [PATCH] workflows: Use docker build action

Fixes the threads argument bug by passing it via environment variable.

Signed-off-by: Illia Vysochyn <ivysochyn@antmicro.com>
---
 .../github-actions-publish-docker-images.yml  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/github-actions-publish-docker-images.yml b/.github/workflows/github-actions-publish-docker-images.yml
index 22add114f6..822fb54164 100644
--- a/.github/workflows/github-actions-publish-docker-images.yml
+++ b/.github/workflows/github-actions-publish-docker-images.yml
@@ -44,7 +44,6 @@ jobs:
           file: docker/Dockerfile.dev
           build-args: |
             fromImage=${{ matrix.os[1] }}
-            numThreads=$(nproc)
           cache-from: type=registry,ref=${{ env.IMAGE_DEPS }}:buildcache
           cache-to: type=registry,ref=${{ env.IMAGE_DEPS }}:buildcache,mode=max
 
@@ -66,6 +65,7 @@ jobs:
         run: |
           echo "IMAGE=ghcr.io/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')-test-cache/${{ matrix.os }}" >> $GITHUB_ENV
           echo "IMAGE_DEPS=ghcr.io/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')-test-cache-deps/${{ matrix.os }}" >> $GITHUB_ENV
+          echo "NUM_THREADS=$(nproc)" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -78,14 +78,15 @@ jobs:
           username: gha
           password: ${{ github.token }}
 
-      - name: Export ORFS image
-        run: |
-          docker buildx build \
-            --build-arg fromImage=${{ env.IMAGE_DEPS }}:latest \
-            --build-arg numThreads=$(nproc) \
-            --cache-from type=registry,ref=${{ env.IMAGE }}:buildcache \
-            --cache-to type=registry,ref=${{ env.IMAGE }}:buildcache,mode=max \
-            --tag ${{ env.IMAGE }}:latest \
-            --file docker/Dockerfile.builder \
-            --push \
-            .
+      - name: Build and export ORFS image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ${{ env.IMAGE }}:latest
+          file: docker/Dockerfile.builder
+          build-args: |
+            fromImage=${{ env.IMAGE_DEPS }}
+            numThreads=${{ env.NUM_THREADS }}
+          cache-from: type=registry,ref=${{ env.IMAGE }}:buildcache
+          cache-to: type=registry,ref=${{ env.IMAGE }}:buildcache,mode=max