Merge pull request #3 from Cervest/docker-login-aws-profile

use aws iam role name as profile in aws ecr get login, else use default
Cervest · May 18, 2021 · 90cd8f7 · 90cd8f7
2 parents 18c9ad7 + e2d2768
commit 90cd8f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/build/index.js b/build/index.js
diff --git a/build/index.js.map b/build/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -58,8 +58,11 @@ const setAWSAssumeRoleProfile = (
   console.log("AWS assume role profile added to ~/.aws/config")
 }
 
-const dockerECRLogin = (awsAccountId: string) => {
-  const loginPassword = shell("aws ecr get-login-password").trim()
+const dockerECRLogin = (awsAccountId: string, awsIamRoleName?: string) => {
+  const awsProfile = awsIamRoleName || "default"
+  const loginPassword = shell(
+    `aws ecr get-login-password --profile ${awsProfile}`
+  ).trim()
   const loginResult = shell(
     `docker login -u AWS -p ${loginPassword} https://${awsAccountId}.dkr.ecr.eu-west-1.amazonaws.com`
   )
@@ -114,7 +117,7 @@ const main = () => {
   if (awsIamRoleName) {
     setAWSAssumeRoleProfile(awsIamRoleName, awsAccountId)
   }
-  dockerECRLogin(awsAccountId)
+  dockerECRLogin(awsAccountId, awsIamRoleName)
   setKubernetesConfig(awsAccountId, encodedKubeConfig, cluster)
 }