Merge pull request #22 from crazy-max/fix-buildx-install

buildx: use correct url for getRelease
docker · Feb 2, 2023 · 7d5ed41 · 7d5ed41
2 parents 63427f8 + 87a4161
commit 7d5ed41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/__tests__/buildx/install.test.ts b/__tests__/buildx/install.test.ts
@@ -97,6 +97,6 @@ describe('getRelease', () => {
   });
 
   it('unknown release', async () => {
-    await expect(Install.getRelease('foo')).rejects.toThrowError(new Error('Cannot find Buildx release foo in https://raw.githubusercontent.com/docker/buildx/master/.github/releases.json'));
+    await expect(Install.getRelease('foo')).rejects.toThrowError(new Error('Cannot find Buildx release foo in https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/buildx-releases.json'));
   });
 });
diff --git a/src/buildx/install.ts b/src/buildx/install.ts
@@ -54,7 +54,7 @@ export class Install {
     return this.setPlugin(toolPath, dest);
   }
 
-  public async setStandalone(toolPath: string, dest: string): Promise<string> {
+  private async setStandalone(toolPath: string, dest: string): Promise<string> {
     const toolBinPath = path.join(toolPath, os.platform() == 'win32' ? 'docker-buildx.exe' : 'docker-buildx');
     const binDir = path.join(dest, 'bin');
     if (!fs.existsSync(binDir)) {
@@ -68,7 +68,7 @@ export class Install {
     return buildxPath;
   }
 
-  public async setPlugin(toolPath: string, dest: string): Promise<string> {
+  private async setPlugin(toolPath: string, dest: string): Promise<string> {
     const toolBinPath = path.join(toolPath, os.platform() == 'win32' ? 'docker-buildx.exe' : 'docker-buildx');
     const pluginsDir: string = path.join(dest, 'cli-plugins');
     if (!fs.existsSync(pluginsDir)) {
@@ -124,8 +124,7 @@ export class Install {
   }
 
   public static async getRelease(version: string): Promise<GitHubRelease> {
-    // FIXME: Use https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/buildx-releases.json when repo public
-    const url = `https://raw.githubusercontent.com/docker/buildx/master/.github/releases.json`;
+    const url = `https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/buildx-releases.json`;
     const http: httpm.HttpClient = new httpm.HttpClient('docker-actions-toolkit');
     const resp: httpm.HttpClientResponse = await http.get(url);
     const body = await resp.readBody();