From 81ba13b92d883d6969e2df25eb195309d1739203 Mon Sep 17 00:00:00 2001
From: hyness <hyness@freshlegacycode.org>
Date: Wed, 3 Apr 2024 20:58:35 -0700
Subject: [PATCH] Authentication with docker login

---
 .github/workflows/build-and-deploy-image.yml | 21 ++++++++++----------
 build.gradle.kts                             |  6 ------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-and-deploy-image.yml b/.github/workflows/build-and-deploy-image.yml
index b42ce94..b1424ea 100644
--- a/.github/workflows/build-and-deploy-image.yml
+++ b/.github/workflows/build-and-deploy-image.yml
@@ -59,25 +59,26 @@ jobs:
         if: inputs.tags != ''
         run: echo "TAGS=-PdockerTags=${{ inputs.tags }}" >> $GITHUB_ENV
 
-      - name: Setup Docker Hub credentials
+      - name: Login to DockerHub
         if: inputs.registry == 'docker.io'
-        run: |
-          echo "DOCKER_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" >> $GITHUB_ENV
-          echo "DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }}" >> $GITHUB_ENV
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Setup GitHub Container Registry credentials
+      - name: Login to GitHub Container Registry
         if: inputs.registry == 'ghcr.io'
-        run: |
-          echo "DOCKER_USERNAME=${{ github.actor }}" >> $GITHUB_ENV
-          echo "DOCKER_PASSWORD=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and deploy OCI image
         run: >
           ./gradlew bootBuildImage
           -PjvmType=${{ inputs.image-jvm-type }}
           -PjdkVersion=${{ inputs.image-jvm-version }}
-          -PdockerUsername=${{ env.DOCKER_USERNAME }}
-          -PdockerPassword=${{ env.DOCKER_PASSWORD }}
           $TAGS
           --imageName=${{ inputs.registry }}/${{ inputs.image-name }}
           --publishImage
diff --git a/build.gradle.kts b/build.gradle.kts
index bfbc43c..6cba119 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,8 +8,6 @@ plugins {
 
 val jdkVersion: String by project
 val jvmType: String by project
-val dockerUsername: String by project
-val dockerPassword: String by project
 val dockerTags: String? by project
 val imageRegistry: String? by project
 val imageName: String? by project
@@ -54,10 +52,6 @@ tasks {
             "paketo-buildpacks/environment-variables",
             "gcr.io/paketo-buildpacks/health-checker"
         )
-        docker.publishRegistry {
-            username = dockerUsername
-            password = dockerPassword
-        }
         environment = mapOf(
             "BP_JVM_TYPE" to jvmType,
             "BP_JVM_VERSION" to jdkVersion,