diff --git a/.forgejo/actions/build-docker/action.yml b/.forgejo/actions/build-docker/action.yml index ebf3c5b..84926b6 100644 --- a/.forgejo/actions/build-docker/action.yml +++ b/.forgejo/actions/build-docker/action.yml @@ -7,9 +7,6 @@ inputs: password: description: Registry Password required: true - dockerfile: - description: The Dockerfile to build - required: false context: description: Build context directory (absolute or relative to GITHUB_WORKSPACE) required: false @@ -22,42 +19,10 @@ runs: with: username: ${{ inputs.username }} - # Both dockerfile and context provided - - name: Build-Docker Build (df + ctx) - if: ${{ inputs.dockerfile != '' && inputs.context != '' }} - uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3 - with: - image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest - username: ${{ inputs.username }} - password: ${{ inputs.password }} - dockerfile: ${{ inputs.dockerfile }} - context: ${{ inputs.context }} - - # Only dockerfile provided - - name: Build-Docker Build (df only) - if: ${{ inputs.dockerfile != '' && (inputs.context == '' || !inputs.context) }} - uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3 - with: - image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest - username: ${{ inputs.username }} - password: ${{ inputs.password }} - dockerfile: ${{ inputs.dockerfile }} - - # Only context provided - - name: Build-Docker Build (ctx only) - if: ${{ (inputs.dockerfile == '' || !inputs.dockerfile) && inputs.context != '' }} + - name: Build-Docker Build Docker Image uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3 with: image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest username: ${{ inputs.username }} password: ${{ inputs.password }} context: ${{ inputs.context }} - - # Neither dockerfile nor context provided - - name: Build-Docker Build (defaults) - if: ${{ (inputs.dockerfile == '' || !inputs.dockerfile) && (inputs.context == '' || !inputs.context) }} - uses: https://git.lhprovedor.com.br/leandro/forgejo-kaniko-action@v3 - with: - image: ${{ inputs.username }}/${{ env.IMAGE_NAME }}:${{ github.sha }},${{ inputs.username }}/${{ env.IMAGE_NAME }}:latest - username: ${{ inputs.username }} - password: ${{ inputs.password }}