From e5e852cdd14793d070df24e6e7f8c80b2660565b Mon Sep 17 00:00:00 2001 From: Ondrej Vlach Date: Sat, 25 Jan 2025 12:47:11 +0100 Subject: [PATCH] support for dockerfile --- action.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 67f667b..582e810 100644 --- a/action.yml +++ b/action.yml @@ -22,6 +22,10 @@ inputs: description: 'Additional version' required: false default: '' + docker_file: + description: 'Dockerfile' + required: false + default: 'Dockerfile' outputs: image_version: description: "Image version" @@ -50,6 +54,11 @@ runs: shell: sh - name: Build and push docker run: | - docker build . -t ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}${{ steps.git.outputs.short_hash }} ${{steps.additional_args.outputs.additional_args}} ${{ inputs.additional_args }} && \ - docker push ${{ inputs.image_name }}:${{ steps.git.outputs.short_hash }} + docker build . -f ${{inputs.docker_file}} -t ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{ steps.git.outputs.short_hash }} ${{steps.additional_args.outputs.additional_args}} ${{ inputs.additional_args }} + + docker push ${{ inputs.image_name }}:${{inputs.docker_version_prefix}}-${{ steps.git.outputs.short_hash }} + + if [[ "${{inputs.additional_version}}" != "" ]]; then + git push ${{ inputs.image_name }}:${{inputs.additional_version}}-${{inputs.docker_version_prefix}} + fi shell: sh