Fix docker: invalid reference format

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Jun 29, 2021 · d5b70f5 · d5b70f5
1 parent 2e941f2
commit d5b70f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/__tests__/buildx.test.ts b/__tests__/buildx.test.ts
@@ -23,7 +23,7 @@ describe('getVersion', () => {
         silent: true
       })
       .then(res => {
-        return !res.stdout.includes(' ') && res.exitCode == 0;
+        return !res.stdout.trim().includes(' ') && res.exitCode == 0;
       });
   }
   (isDaemonRunning() ? it : it.skip)(
@@ -55,7 +55,7 @@ describe('inspect', () => {
         silent: true
       })
       .then(res => {
-        return !res.stdout.includes(' ') && res.exitCode == 0;
+        return !res.stdout.trim().includes(' ') && res.exitCode == 0;
       });
   }
   (isDaemonRunning() ? it : it.skip)(

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/buildx.ts b/src/buildx.ts
@@ -42,7 +42,7 @@ export async function getVersion(): Promise<string> {
       if (res.stderr.length > 0 && res.exitCode != 0) {
         throw new Error(res.stderr.trim());
       }
-      return parseVersion(res.stdout);
+      return parseVersion(res.stdout.trim());
     });
 }
 
@@ -196,21 +196,21 @@ export async function getBuildKitVersion(containerID: string): Promise<string> {
     .then(bkitimage => {
       if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
         return exec
-          .getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout, '--version'], {
+          .getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
             ignoreReturnCode: true,
             silent: true
           })
           .then(bkitversion => {
             if (bkitversion.exitCode == 0 && bkitversion.stdout.length > 0) {
-              return `${bkitimage.stdout} => ${bkitversion.stdout}`;
+              return `${bkitimage.stdout.trim()} => ${bkitversion.stdout.trim()}`;
             } else if (bkitversion.stderr.length > 0) {
               core.warning(bkitversion.stderr.trim());
             }
-            return bkitversion.stdout;
+            return bkitversion.stdout.trim();
           });
       } else if (bkitimage.stderr.length > 0) {
         core.warning(bkitimage.stderr.trim());
       }
-      return bkitimage.stdout;
+      return bkitimage.stdout.trim();
     });
 }