diff --git a/actions/java-gradle-build-jib/action.yaml b/actions/java-gradle-build-jib/action.yaml index 11296fc89..e706e3260 100644 --- a/actions/java-gradle-build-jib/action.yaml +++ b/actions/java-gradle-build-jib/action.yaml @@ -90,27 +90,26 @@ runs: - name: Build Docker image run: | if [ "${{ github.ref_type }}" != "tag" ]; then - ./gradlew ${{ inputs.subproject && format('{0}:', inputs.subproject) || '' }}jib \ - --info --stacktrace \ - --image=${{ inputs.image-name }} \ - -Djib.from.platforms=${{ inputs.platforms }} \ - ${{ inputs.jib-from-image && format('-Djib.from.image={0}', inputs.jib-from-image) || '' }} \ - ${{ inputs.class && format('-Djib.container.mainClass={0}', inputs.class) || '' }} \ - -Djib.to.image=${{ inputs.full-image-name }}$(echo ${{ steps.meta.outputs.tags }} | grep 'pipeline' | sed 's/.*\(:.*\)/\1/') \ - -Djib.to.tags=$(echo "${{ steps.meta.outputs.tags }}" | tr ',' '\n' | sed 's/.*://') \ - ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} \ - ${{ inputs.allow-insecure-registries == 'true' && '-Djib.allowInsecureRegistries=true' || '' }} + ./gradlew ${{ inputs.subproject && format('{0}:', inputs.subproject) || '' }}jib \ + --info --stacktrace \ + --image=${{ inputs.image-name }} \ + -Djib.from.platforms=${{ inputs.platforms }} \ + ${{ inputs.jib-from-image && format('-Djib.from.image={0}', inputs.jib-from-image) || '' }} \ + ${{ inputs.class && format('-Djib.container.mainClass={0}', inputs.class) || '' }} \ + -Djib.to.image=${{ inputs.full-image-name }}$(echo ${{ steps.meta.outputs.tags }} | grep 'pipeline' | sed 's/.*\(:.*\)/\1/') \ + ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} \ + ${{ inputs.allow-insecure-registries == 'true' && '-Djib.allowInsecureRegistries=true' || '' }} else ./gradlew ${{ inputs.subproject && format('{0}:', inputs.subproject) || '' }}jib \ - --info --stacktrace \ - --image=${{ inputs.image-name }} \ - -Djib.from.platforms=${{ inputs.platforms }} \ - ${{ inputs.jib-from-image && format('-Djib.from.image={0}', inputs.jib-from-image) || '' }} \ - ${{ inputs.class && format('-Djib.container.mainClass={0}', inputs.class) || '' }} \ - -Djib.to.image=${{ inputs.full-image-name }} \ - -Djib.to.tags=${{ steps.meta.outputs.version } \ - ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} \ - ${{ inputs.allow-insecure-registries == 'true' && '-Djib.allowInsecureRegistries=true' || '' }} + --info --stacktrace \ + --image=${{ inputs.image-name }} \ + -Djib.from.platforms=${{ inputs.platforms }} \ + ${{ inputs.jib-from-image && format('-Djib.from.image={0}', inputs.jib-from-image) || '' }} \ + ${{ inputs.class && format('-Djib.container.mainClass={0}', inputs.class) || '' }} \ + -Djib.to.image=${{ inputs.full-image-name }} \ + -Djib.to.tags=${{ steps.meta.outputs.version }} \ + ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }} \ + ${{ inputs.allow-insecure-registries == 'true' && '-Djib.allowInsecureRegistries=true' || '' }} fi shell: bash working-directory: ${{ inputs.working-directory }}