From 2b6ec18beeffd3422bccd81bd07e8125da5ebd88 Mon Sep 17 00:00:00 2001
From: erikzaadi <erik@getport.io>
Date: Sun, 20 Oct 2024 18:01:53 +0300
Subject: [PATCH] [SQUASH] Fix correct dockerfile

---
 .github/workflows/actions/build-docker-image/action.yml | 8 ++++++--
 .github/workflows/ci.yml                                | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions/build-docker-image/action.yml b/.github/workflows/actions/build-docker-image/action.yml
index f14f6abcea..5c8a19ba71 100644
--- a/.github/workflows/actions/build-docker-image/action.yml
+++ b/.github/workflows/actions/build-docker-image/action.yml
@@ -29,6 +29,10 @@ inputs:
   docker-password:
     required: true
     description: Docker Hub User
+  skip-push:
+    required: false
+    description: Optionally skip push
+    default: ''
 
 runs:
   using: 'composite'
@@ -57,9 +61,9 @@ runs:
       uses: docker/build-push-action@v6
       with:
         context: .
-        file: ./integrations/_infra/Dockerfile.base.runner
+        file: ${{ inputs.dockerfile }}
         platforms: ${{ inputs.platforms }}
-        push: true
+        push: ${{ inputs.skip-push == '' }}
         load: ${{ inputs.test != '' }}
         tags: ${{ inputs.tags }}
         build-args: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e30c77658f..f1bf2cb5c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,3 +101,4 @@ jobs:
             INTEGRATION_VERSION=${{ steps.prepare_tags.outputs.version }}
           docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
           docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
+          skip-push: 'yupp'