Skip to content

Commit

Permalink
[SQUASH] Fix correct dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
erikzaadi committed Oct 20, 2024
1 parent 15fd38b commit 2b6ec18
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/actions/build-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit 2b6ec18

Please sign in to comment.