From f12ba2542aa6b5ee38d137eb8587416250f3677b Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Tue, 15 Aug 2023 00:27:21 +0200
Subject: [PATCH] Use credentials from docker login

---
 .drone.yml                      | 9 ++++++---
 module-deploy/deploy.gradle.kts | 6 ------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 4383456..2a7562d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -49,13 +49,16 @@ clone:
 steps:
   - name: build Docker container
     image: gradle:8.2-jdk17
+    environment:
+      USERNAME:
+        from_secret: docker_username
+      PASSWORD:
+        from_secret: docker_password
     volumes:
       - name: cache
         path: /home/gradle/.gradle
     commands:
-      - wget https://github.com/docker/docker-credential-helpers/releases/download/v0.8.0/docker-credential-pass-v0.8.0.linux-arm64
-      - mv docker-credential-pass-v0.8.0.linux-arm64 docker-credential-pass
-      - chmod +x ./docker-credential-pass
+      - docker login -u $USERNAME -p $PASSWORD
       - ./gradlew jib
 
 volumes:
diff --git a/module-deploy/deploy.gradle.kts b/module-deploy/deploy.gradle.kts
index 234143a..1432426 100644
--- a/module-deploy/deploy.gradle.kts
+++ b/module-deploy/deploy.gradle.kts
@@ -6,9 +6,6 @@ dependencies {
     implementation(project(":server"))
 }
 
-val dockerUsername = System.getenv("DOCKER_USERNAME") ?: "UNKNOWN"
-val dockerPassword = System.getenv("DOCKER_PASSWORD") ?: "UNKNOWN"
-
 jib {
     from {
         image = "amazoncorretto:" + properties["projectSourceCompatibility"]
@@ -28,9 +25,6 @@ jib {
         tags = setOf(
                 "latest",
                 properties["version"].toString().replace("+", "-"))
-        credHelper {
-            helper = "pass"
-        }
     }
     container {
         extraClasspath = listOf("/configmap")