From 736299350028476db4d263a530ec48454c1b8b1f Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Tue, 2 Jan 2024 15:54:07 +0300
Subject: [PATCH] Update docker credentials configuration to use `docker login`

---
 jfrog-oauth/run.sh | 15 ++++-----------
 jfrog-token/run.sh | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/jfrog-oauth/run.sh b/jfrog-oauth/run.sh
index 148307a..70ac377 100644
--- a/jfrog-oauth/run.sh
+++ b/jfrog-oauth/run.sh
@@ -62,18 +62,11 @@ if [ -z "${REPOSITORY_DOCKER}" ]; then
   echo "🤔 no docker repository is set, skipping docker configuration."
   echo "You can configure a docker repository by providing the a key for 'docker' in the 'package_managers' input."
 else
-  echo "🐳 Configuring docker..."
+  echo "🔑 Configuring 🐳 docker credentials..."
   mkdir -p ~/.docker
-  cat << EOF > ~/.docker/config.json
-{
-  "auths": {
-    "${JFROG_HOST}": {
-      "auth": "$(echo -n "${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}" | base64 -w0)",
-      "email": "${ARTIFACTORY_EMAIL}"
-    }
-  }
-}
-EOF
+  echo -n "${ARTIFACTORY_ACCESS_TOKEN}" >> ~/.docker/token
+  cat ~/.docker/token | docker login ${JFROG_HOST} --username ${ARTIFACTORY_USERNAME} --password-stdin
+  rm ~/.docker/token
 fi
 
 # Install the JFrog vscode extension for code-server.
diff --git a/jfrog-token/run.sh b/jfrog-token/run.sh
index 6037395..d2359b6 100644
--- a/jfrog-token/run.sh
+++ b/jfrog-token/run.sh
@@ -62,18 +62,11 @@ if [ -z "${REPOSITORY_DOCKER}" ]; then
   echo "🤔 no docker repository is set, skipping docker configuration."
   echo "You can configure a docker repository by providing the a key for 'docker' in the 'package_managers' input."
 else
-  echo "🐳 Configuring docker..."
+  echo "🔑 Configuring 🐳 docker credentials..."
   mkdir -p ~/.docker
-  cat << EOF > ~/.docker/config.json
-{
-  "auths": {
-    "${JFROG_HOST}": {
-      "auth": "$(echo -n "${ARTIFACTORY_USERNAME}:${ARTIFACTORY_ACCESS_TOKEN}" | base64 -w0)",
-      "email": "${ARTIFACTORY_EMAIL}"
-    }
-  }
-}
-EOF
+  echo -n "${ARTIFACTORY_ACCESS_TOKEN}" >> ~/.docker/token
+  cat ~/.docker/token | docker login ${JFROG_HOST} --username ${ARTIFACTORY_USERNAME} --password-stdin
+  rm ~/.docker/token
 fi
 
 # Install the JFrog vscode extension for code-server.