Merge pull request #13 from crazy-max/master

Take the password from stdin
docker · Sep 24, 2020 · 0f9fb80 · 0f9fb80
2 parents 53f337d + b7800fe
commit 0f9fb80
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/docker.ts b/src/docker.ts
@@ -19,7 +19,7 @@ export async function logout(registry: string): Promise<void> {
 }
 
 export async function loginStandard(registry: string, username: string, password: string): Promise<void> {
-  let loginArgs: Array<string> = ['login', '--password', password];
+  let loginArgs: Array<string> = ['login', '--password-stdin'];
   if (username) {
     loginArgs.push('--username', username);
   }
@@ -30,7 +30,7 @@ export async function loginStandard(registry: string, username: string, password
   } else {
     core.info(`🔑 Logging into DockerHub...`);
   }
-  await execm.exec('docker', loginArgs, true).then(res => {
+  await execm.exec('docker', loginArgs, true, password).then(res => {
     if (res.stderr != '' && !res.success) {
       throw new Error(res.stderr);
     }

diff --git a/src/exec.ts b/src/exec.ts
@@ -7,13 +7,19 @@ export interface ExecResult {
   stderr: string;
 }
 
-export const exec = async (command: string, args: string[] = [], silent: boolean): Promise<ExecResult> => {
+export const exec = async (
+  command: string,
+  args: string[] = [],
+  silent: boolean,
+  stdin?: string
+): Promise<ExecResult> => {
   let stdout: string = '';
   let stderr: string = '';
 
   const options: ExecOptions = {
     silent: silent,
-    ignoreReturnCode: true
+    ignoreReturnCode: true,
+    input: Buffer.from(stdin || '')
   };
   options.listeners = {
     stdout: (data: Buffer) => {