Merge pull request #41 from crazy-max/fix-public-ecr

Fix public ECR login with AWS CLI v1
docker · Dec 17, 2020 · 7b79d7e · 7b79d7e
2 parents 3b14bab + f53ca52
commit 7b79d7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/aws.ts b/src/aws.ts
@@ -47,7 +47,7 @@ export const parseCLIVersion = async (stdout: string): Promise<string> => {
 
 export const getDockerLoginCmd = async (cliVersion: string, registry: string, region: string): Promise<string> => {
   let ecrCmd = (await isPubECR(registry)) ? 'ecr-public' : 'ecr';
-  if (semver.satisfies(cliVersion, '>=2.0.0')) {
+  if (semver.satisfies(cliVersion, '>=2.0.0') || (await isPubECR(registry))) {
     return execCLI([ecrCmd, 'get-login-password', '--region', region]).then(pwd => {
       return `docker login --username AWS --password ${pwd} ${registry}`;
     });