From 822ac27faf06bf189e1be0cba566d162d4c358ff Mon Sep 17 00:00:00 2001
From: zypriafl <florian.zyprian@yahoo.de>
Date: Tue, 10 Sep 2024 15:15:10 +0200
Subject: [PATCH] Update push-docker.yml

---
 .github/workflows/push-docker.yml | 74 +++++++++----------------------
 1 file changed, 21 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index 194fe51ad..60195daa0 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -1,12 +1,11 @@
+---
 name: Push Docker Image with VersionNumber
-
 on:
-  workflow_dispatch:
+  workflow_dispatch: null
   push:
     branches:
       - master
       - main
-
 permissions:
   contents: read
   packages: write
@@ -15,81 +14,50 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: "17"
-          distribution: "temurin"
-
-      - uses: gradle/actions/setup-gradle@v4
-        with:
-name: Push Docker Image with VersionNumber
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-      - main
-
-permissions:
-  contents: read
-  packages: write
-jobs:
-  push:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: "17"
-          distribution: "temurin"
-
+          distribution: temurin
       - uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: 8.7
-
       - name: Run Gradle Command
         run: ./gradlew clean build
         env:
           DOCKER_ENABLE_SECURITY: false
-
       - 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
-
+        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >>
+          $GITHUB_OUTPUT
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-
       - name: Convert repository owner to lowercase
         id: repoowner
-        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
-
+        run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print
+          tolower($0)}')" >> $GITHUB_OUTPUT
       - name: Generate tags
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
+          tags: >
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{
+            github.ref == 'refs/heads/master' }}
 
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+
+            type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
       - name: Build and push main Dockerfile
         uses: docker/build-push-action@v6
         with:
@@ -103,7 +71,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-
       - name: Generate tags ultra-lite
         id: meta2
         uses: docker/metadata-action@v5
@@ -111,10 +78,11 @@ jobs:
         with:
           images: |
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
+          tags: >
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber
+            }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
 
+            type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
       - name: Build and push Dockerfile-ultra-lite
         uses: docker/build-push-action@v6
         if: github.ref != 'refs/heads/main'
@@ -128,7 +96,6 @@ jobs:
           labels: ${{ steps.meta2.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
-
       - name: Generate tags fat
         id: meta3
         uses: docker/metadata-action@v5
@@ -136,10 +103,11 @@ jobs:
         with:
           images: |
             ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
-          tags: |
-            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
+          tags: >
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber
+            }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
 
+            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
       - name: Build and push main Dockerfile fat
         uses: docker/build-push-action@v6
         if: github.ref != 'refs/heads/main'