Update push-docker.yml

.github/workflows/push-docker.yml

@@ -16,9 +16,6 @@ jobs:
       packages: write
       id-token: write
     steps:
-#<<<<<<< HEAD
-#      - uses: actions/checkout@v4
-#=======
       - name: Harden Runner
         uses: step-security/harden-runner@c95a14d0e5bab51a9f56296a4eb0e416910cd350 # v2.10.3
         with:
@@ -26,37 +23,20 @@ jobs:
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-#>>>>>>> temp-branch-from-tag
       - name: Set up JDK 17
         uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
         with:
           java-version: "17"
-#<<<<<<< HEAD
-#          distribution: temurin
-#      - uses: gradle/actions/setup-gradle@v4
-#        with:
-#          gradle-version: 8.7
-#=======
           distribution: "temurin"
 
       - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
         with:
           gradle-version: 8.12
 
-#>>>>>>> temp-branch-from-tag
       - name: Run Gradle Command
         run: ./gradlew clean build
         env:
           DOCKER_ENABLE_SECURITY: false
-#<<<<<<< HEAD
-#      - name: Set up Docker Buildx
-#        id: buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Get version number
-#        id: versionNumber
-#        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >>
-#          $GITHUB_OUTPUT
-#=======
 
       - name: Install cosign
         if: github.ref == 'refs/heads/master'
@@ -72,13 +52,6 @@ jobs:
         id: versionNumber
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
 
-#      - name: Login to Docker Hub
-#        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-#        with:
-#          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-#          password: ${{ secrets.DOCKER_HUB_API }}
-
-#>>>>>>> temp-branch-from-tag
       - name: Login to GitHub Container Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
@@ -86,12 +59,8 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Set up QEMU
-#<<<<<<< HEAD
-#        uses: docker/setup-qemu-action@v3
-#=======
         uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
 
-#>>>>>>> temp-branch-from-tag
       - name: Convert repository owner to lowercase
         id: repoowner
         run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print
@@ -103,7 +72,6 @@ jobs:
           images: |
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/stirling-pdf
-            #${{ secrets.DOCKER_HUB_ORG_USERNAME }}/stirling-pdf
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{github.ref == 'refs/heads/main' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
@@ -122,12 +90,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-#<<<<<<< HEAD
-#      - name: Generate tags ultra-lite
-#        id: meta2
-#        uses: docker/metadata-action@v5
-#        if: github.ref == 'refs/heads/main'
-#=======
           provenance: true
           sbom: true
 
@@ -149,7 +111,6 @@ jobs:
         id: meta2
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         if: github.ref != 'refs/heads/main'
-#>>>>>>> temp-branch-from-tag
         with:
           images: |
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
@@ -158,15 +119,11 @@ jobs:
           tags: |
             type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/main' }}
             type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/main' }}
+
       - name: Build and push Dockerfile-ultra-lite
-#<<<<<<< HEAD
-#        uses: docker/build-push-action@v6
-#        if: github.ref == 'refs/heads/main'
-#=======
         id: build-push-lite
         uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         if: github.ref != 'refs/heads/main'
-#>>>>>>> temp-branch-from-tag
         with:
           context: .
           file: ./Dockerfile.ultra-lite
@@ -177,12 +134,6 @@ jobs:
           labels: ${{ steps.meta2.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-#<<<<<<< HEAD
-#      - name: Generate tags fat
-#        id: meta3
-#        uses: docker/metadata-action@v5
-#        if: github.ref == 'refs/heads/main'
-#=======
           provenance: true
           sbom: true
 
@@ -190,7 +141,6 @@ jobs:
         id: meta3
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         if: github.ref != 'refs/heads/main'
-#>>>>>>> temp-branch-from-tag
         with:
           images: |
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
@@ -201,14 +151,9 @@ jobs:
             type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push main Dockerfile fat
-#<<<<<<< HEAD
-#        uses: docker/build-push-action@v6
-#        if: github.ref == 'refs/heads/master'
-#=======
         id: build-push-fat
         uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         if: github.ref != 'refs/heads/main'
-#>>>>>>> temp-branch-from-tag
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .