From 2c8b22b2ed1e92141f4d37b4dbed327744a44350 Mon Sep 17 00:00:00 2001 From: Lorenzo D'Agostino Date: Fri, 24 May 2024 15:54:53 +0200 Subject: [PATCH 1/2] feat: add dockerfile input to docker workflow --- .github/workflows/docker.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index c3b367d..e86e63a 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -21,6 +21,11 @@ on: required: false type: 'string' default: '.' + dockerfile: + description: 'Dockerfile path' + required: false + type: 'string' + default: 'Dockerfile' secrets: USERNAME: description: 'Registry username' @@ -57,5 +62,6 @@ jobs: uses: docker/build-push-action@v5 with: context: ${{ inputs.context }} + file: ${{ inputs.context }}/${{ inputs.dockerfile }} push: ${{ inputs.push }} tags: ${{ secrets.ORGANIZATION }}/${{ inputs.image }}:${{ inputs.tag }} \ No newline at end of file From 56858addacfdf76c7ae31ff4b62897fac6609467 Mon Sep 17 00:00:00 2001 From: Lorenzo D'Agostino Date: Fri, 24 May 2024 15:59:03 +0200 Subject: [PATCH 2/2] fix: using action checkout v4 --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e86e63a..1ed5823 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -43,7 +43,7 @@ jobs: steps: - name: Clone repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3