From 2092176f99250e3bbef8efc3b0520d45005d5fd4 Mon Sep 17 00:00:00 2001
From: Federico Di Pierro <nierro92@gmail.com>
Date: Fri, 19 May 2023 14:17:03 +0200
Subject: [PATCH 1/2] fix(ci): use normal docker to build docker images,
 instead of buildx.

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

diff --git a/.github/workflows/reusable_build_docker.yaml b/.github/workflows/reusable_build_docker.yaml
index f1fab40290f..a3caae75653 100644
--- a/.github/workflows/reusable_build_docker.yaml
+++ b/.github/workflows/reusable_build_docker.yaml
@@ -36,26 +36,22 @@ jobs:
         uses: docker/setup-buildx-action@v2
           
       - name: Build no-driver image
-        uses: docker/build-push-action@v3
-        with:
-          context: ${{ github.workspace }}/docker/no-driver/
-          build-args: |
-            VERSION_BUCKET=bin${{ inputs.bucket_suffix }}
-            FALCO_VERSION=${{ inputs.version }}
-          tags: |
-            docker.io/falcosecurity/falco-no-driver:${{ inputs.arch }}-${{ inputs.tag }}
-          outputs: type=docker,dest=/tmp/falco-no-driver-${{ inputs.arch }}.tar
+        run: |
+          cd ${{ github.workspace }}/docker/no-driver/
+          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 }} \
+            --output type=docker,dest=/tmp/falco-no-driver-${{ inputs.arch }}.tar \
+            .
             
       - name: Build falco image
-        uses: docker/build-push-action@v3
-        with:
-          context: ${{ github.workspace }}/docker/falco/
-          build-args: |
-            VERSION_BUCKET=deb${{ inputs.bucket_suffix }}
-            FALCO_VERSION=${{ inputs.version }}
-          tags: |
-            docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }}
-          outputs: type=docker,dest=/tmp/falco-${{ inputs.arch }}.tar
+        run: |
+          cd ${{ github.workspace }}/docker/falco/
+          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 }} \
+            --output type=docker,dest=/tmp/falco-${{ inputs.arch }}.tar \
+            .
 
       # The falcosecurity/falco image is required for the driver-loader image, so we need to load it
       - name: Load the falcosecurity/falco image
@@ -63,14 +59,12 @@ jobs:
           docker load --input /tmp/falco-${{ inputs.arch }}.tar
 
       - name: Build falco-driver-loader image
-        uses: docker/build-push-action@v3
-        with:
-          context: ${{ github.workspace }}/docker/driver-loader/
-          build-args: |
-            FALCO_IMAGE_TAG=${{ inputs.arch }}-${{ inputs.tag }}
-          tags: |
-            docker.io/falcosecurity/falco-driver-loader:${{ inputs.arch }}-${{ inputs.tag }}
-          outputs: type=docker,dest=/tmp/falco-driver-loader-${{ inputs.arch }}.tar  
+        run: |
+          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 }}
+            --output type=docker,dest=/tmp/falco-driver-loader-${{ inputs.arch }}.tar \
+            .
             
       - name: Upload images tarballs
         uses: actions/upload-artifact@v3

From f6de97d0f640650feed30e190c898af62eec82a4 Mon Sep 17 00:00:00 2001
From: Federico Di Pierro <nierro92@gmail.com>
Date: Fri, 19 May 2023 14:22:34 +0200
Subject: [PATCH 2/2] chore(ci): fixed up missing '\' chars.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

Co-authored-by: Luca Guerra <luca@guerra.sh>
---
 .github/workflows/reusable_build_docker.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable_build_docker.yaml b/.github/workflows/reusable_build_docker.yaml
index a3caae75653..588236ec482 100644
--- a/.github/workflows/reusable_build_docker.yaml
+++ b/.github/workflows/reusable_build_docker.yaml
@@ -39,7 +39,7 @@ jobs:
         run: |
           cd ${{ github.workspace }}/docker/no-driver/
           docker build -t docker.io/falcosecurity/falco-no-driver:${{ inputs.arch }}-${{ inputs.tag }} \
-            --build-arg VERSION_BUCKET=bin${{ inputs.bucket_suffix }} 
+            --build-arg VERSION_BUCKET=bin${{ inputs.bucket_suffix }} \
             --build-arg FALCO_VERSION=${{ inputs.version }} \
             --output type=docker,dest=/tmp/falco-no-driver-${{ inputs.arch }}.tar \
             .
@@ -48,7 +48,7 @@ jobs:
         run: |
           cd ${{ github.workspace }}/docker/falco/
           docker build -t docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }} \
-            --build-arg VERSION_BUCKET=deb${{ inputs.bucket_suffix }} 
+            --build-arg VERSION_BUCKET=deb${{ inputs.bucket_suffix }} \
             --build-arg FALCO_VERSION=${{ inputs.version }} \
             --output type=docker,dest=/tmp/falco-${{ inputs.arch }}.tar \
             .
@@ -62,7 +62,7 @@ jobs:
         run: |
           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 FALCO_IMAGE_TAG=${{ inputs.arch }}-${{ inputs.tag }} \
             --output type=docker,dest=/tmp/falco-driver-loader-${{ inputs.arch }}.tar \
             .