debug: maybe without the escape

bakdata · Jun 23, 2024 · 809a9fe · 809a9fe
1 parent 6aa0740
commit 809a9fe
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/actions/java-gradle-build-push-jib-multi-plaftorm/action.yaml b/actions/java-gradle-build-push-jib-multi-plaftorm/action.yaml
@@ -98,22 +98,6 @@ runs:
 
     - name: Build Docker image
       run: |
-        cat <<EOF
-          ./gradlew ${{ inputs.subproject && format('{0}:', inputs.subproject) || '' }} jib \
-          --info --stacktrace \
-          --image=${{github.repository}}_${{ github.run_id }}_${{github.run_number}} \
-          -Djib.from.platforms=linux/arm64,linux/amd64 \
-          ${{ inputs.jib-from-image && format('-Djib.from.image={0}', inputs.jib-from-image) || '' }} \
-          ${{ inputs.class && format('-Djib.container.mainClass={0}', inputs.class) || '' }} \
-          -DsendCredentialsOverHttp \
-          -Djib.allowInsecureRegistries=true \
-          -Djib.to.image=${{ inputs.full-image-name }} \
-          -Djib.to.tags=$(echo "${{ steps.meta.outputs.tags }}" | sed -zr 's/.*:(.*\n)/\1/gm; s/\n/,/g;  s/(.*),/\1\n/g') \
-          ${{ inputs.registry-username && format('-Djib.to.auth.username={0}', inputs.registry-username) || '' }} \
-          ${{ inputs.registry-password && format('-Djib.to.auth.password={0}', inputs.registry-password) || '' }} \
-          ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }}
-        EOF
-
         ./gradlew ${{ inputs.subproject && format('{0}:', inputs.subproject) || '' }} jib \
           --info --stacktrace \
           --image=${{github.repository}}_${{ github.run_id }}_${{github.run_number}} \
@@ -124,8 +108,8 @@ runs:
           -Djib.allowInsecureRegistries=true \
           -Djib.to.image=${{ inputs.full-image-name }} \
           -Djib.to.tags=$(echo "${{ steps.meta.outputs.tags }}" | sed -zr 's/.*:(.*\n)/\1/gm; s/\n/,/g;  s/(.*),/\1\n/g') \
-          ${{ inputs.registry-username && format('-Djib.to.auth.username=\'{0}\'', inputs.registry-username) || '' }} \
-          ${{ inputs.registry-password && format('-Djib.to.auth.password=\'{0}\'', inputs.registry-password) || '' }} \
+          ${{ inputs.registry-username && format('-Djib.to.auth.username='{0}'', inputs.registry-username) || '' }} \
+          ${{ inputs.registry-password && format('-Djib.to.auth.password='{0}'', inputs.registry-password) || '' }} \
           ${{ inputs.gradle-refresh-dependencies == 'true' && '--refresh-dependencies' || '' }}
       shell: bash
       working-directory: ${{ inputs.working-directory }}