mirror of
https://gitee.com/actions-mirror/docker-login-action
synced 2024-11-27 13:40:43 +08:00
Fix public ECR login with AWS CLI v1
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
parent
3b14bab101
commit
f53ca527f7
2
dist/index.js
generated
vendored
2
dist/index.js
generated
vendored
@ -4204,7 +4204,7 @@ exports.parseCLIVersion = (stdout) => __awaiter(void 0, void 0, void 0, function
|
|||||||
});
|
});
|
||||||
exports.getDockerLoginCmd = (cliVersion, registry, region) => __awaiter(void 0, void 0, void 0, function* () {
|
exports.getDockerLoginCmd = (cliVersion, registry, region) => __awaiter(void 0, void 0, void 0, function* () {
|
||||||
let ecrCmd = (yield exports.isPubECR(registry)) ? 'ecr-public' : 'ecr';
|
let ecrCmd = (yield exports.isPubECR(registry)) ? 'ecr-public' : 'ecr';
|
||||||
if (semver.satisfies(cliVersion, '>=2.0.0')) {
|
if (semver.satisfies(cliVersion, '>=2.0.0') || (yield exports.isPubECR(registry))) {
|
||||||
return exports.execCLI([ecrCmd, 'get-login-password', '--region', region]).then(pwd => {
|
return exports.execCLI([ecrCmd, 'get-login-password', '--region', region]).then(pwd => {
|
||||||
return `docker login --username AWS --password ${pwd} ${registry}`;
|
return `docker login --username AWS --password ${pwd} ${registry}`;
|
||||||
});
|
});
|
||||||
|
@ -47,7 +47,7 @@ export const parseCLIVersion = async (stdout: string): Promise<string> => {
|
|||||||
|
|
||||||
export const getDockerLoginCmd = async (cliVersion: string, registry: string, region: string): Promise<string> => {
|
export const getDockerLoginCmd = async (cliVersion: string, registry: string, region: string): Promise<string> => {
|
||||||
let ecrCmd = (await isPubECR(registry)) ? 'ecr-public' : 'ecr';
|
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 execCLI([ecrCmd, 'get-login-password', '--region', region]).then(pwd => {
|
||||||
return `docker login --username AWS --password ${pwd} ${registry}`;
|
return `docker login --username AWS --password ${pwd} ${registry}`;
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user