From 7130d0c075a191d9a32be783fcdf8110621b429f Mon Sep 17 00:00:00 2001
From: Federico Di Pierro <nierro92@gmail.com>
Date: Fri, 19 May 2023 16:09:54 +0200
Subject: [PATCH] fix(ci): properly pass `TARGET_ARCH` as build-arg to docker.

It gets automatically defined in buildx.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>
---
 .github/workflows/reusable_build_docker.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/reusable_build_docker.yaml b/.github/workflows/reusable_build_docker.yaml
index 588236ec482..fa82eeb6fe4 100644
--- a/.github/workflows/reusable_build_docker.yaml
+++ b/.github/workflows/reusable_build_docker.yaml
@@ -28,6 +28,8 @@ jobs:
   build-docker:
     # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
     runs-on: ${{ (inputs.arch == 'aarch64' && fromJSON('[ "self-hosted", "linux", "ARM64" ]')) || 'ubuntu-latest' }}
+    env:
+      TARGET_ARCH: ${{ (inputs.arch == 'aarch64' && 'arm64') || 'amd64' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -41,6 +43,7 @@ jobs:
           docker build -t docker.io/falcosecurity/falco-no-driver:${{ inputs.arch }}-${{ inputs.tag }} \
             --build-arg VERSION_BUCKET=bin${{ inputs.bucket_suffix }} \
             --build-arg FALCO_VERSION=${{ inputs.version }} \
+            --build-arg TARGET_ARCH=${TARGET_ARCH} \
             --output type=docker,dest=/tmp/falco-no-driver-${{ inputs.arch }}.tar \
             .
             
@@ -50,6 +53,7 @@ jobs:
           docker build -t docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }} \
             --build-arg VERSION_BUCKET=deb${{ inputs.bucket_suffix }} \
             --build-arg FALCO_VERSION=${{ inputs.version }} \
+            --build-arg TARGET_ARCH=${TARGET_ARCH} \
             --output type=docker,dest=/tmp/falco-${{ inputs.arch }}.tar \
             .
 
@@ -63,6 +67,7 @@ jobs:
           cd ${{ github.workspace }}/docker/driver-loader/
           docker build -t docker.io/falcosecurity/falco-driver-loader:${{ inputs.arch }}-${{ inputs.tag }} \
             --build-arg FALCO_IMAGE_TAG=${{ inputs.arch }}-${{ inputs.tag }} \
+            --build-arg TARGET_ARCH=${TARGET_ARCH} \
             --output type=docker,dest=/tmp/falco-driver-loader-${{ inputs.arch }}.tar \
             .