Use latest buildx for git context test

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Aug 16, 2020 · 1c3fedb · 1c3fedb
1 parent 9c47365
commit 1c3fedb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,14 +76,15 @@ jobs:
         name: Set up Docker Buildx
         id: buildx
         uses: ./setup-buildx/ # change to docker/setup-buildx-action@master
-#        with:
-#          driver-opt: network=host
+        with:
+          version: latest
+          #driver-opt: network=host
       -
         name: Build and push
         uses: ./
         env:
-          GITHUB_TOKEN: ${{ github.token }}
-          GITHUB_REF: ${{ github.ref }}
+          GIT_AUTH_TOKEN: ${{ github.token }}
+          GIT_REF: ${{ github.ref }}
         with:
           context: ${{ github.repositoryUrl }}
           file: ./test/Dockerfile

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/context.ts b/src/context.ts
@@ -72,10 +72,12 @@ async function getBuildContext(): Promise<string> {
     return '.';
   }
   try {
-    const gitURL = gitUrlParse(context);
-    gitURL.token = gitURL.token || process.env['GIT_TOKEN'] || process.env['GITHUB_TOKEN'] || '';
-    gitURL.ref = gitURL.ref || process.env['GIT_REF'] || process.env['GITHUB_REF'] || '';
-    return gitURL.toString();
+    const gitUrl = gitUrlParse(context);
+    const gitRef = process.env['GIT_REF'] || '';
+    if (gitRef) {
+      return `${gitUrl.toString()}#${gitRef}`;
+    }
+    return gitUrl.toString();
   } catch {
     return context;
   }