From c80fedbbaee5188e90963451d71a5be94d3ddc4a Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 18 Feb 2023 07:06:20 +0100 Subject: [PATCH 1/2] docker: fix instance Signed-off-by: CrazyMax --- __tests__/docker.test.ts | 4 +-- src/buildx/buildx.ts | 2 +- src/buildx/install.ts | 2 +- src/docker.ts | 59 ++++++++++++++++++++++++---------------- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/__tests__/docker.test.ts b/__tests__/docker.test.ts index a0381a4..6550d53 100644 --- a/__tests__/docker.test.ts +++ b/__tests__/docker.test.ts @@ -48,9 +48,9 @@ describe('configDir', () => { }); describe('isAvailable', () => { - it('cli', () => { + it('cli', async () => { const execSpy = jest.spyOn(exec, 'getExecOutput'); - Docker.isAvailable; + Docker.getInstance().available; // eslint-disable-next-line jest/no-standalone-expect expect(execSpy).toHaveBeenCalledWith(`docker`, undefined, { silent: true, diff --git a/src/buildx/buildx.ts b/src/buildx/buildx.ts index ec8930a..cc71e0b 100644 --- a/src/buildx/buildx.ts +++ b/src/buildx/buildx.ts @@ -41,8 +41,8 @@ export class Buildx { constructor(opts: BuildxOpts) { this.context = opts.context; + this.standalone = opts?.standalone ?? !Docker.getInstance().available; this.inputs = new Inputs(this.context); - this.standalone = opts?.standalone ?? !Docker.isAvailable; } static get configDir(): string { diff --git a/src/buildx/install.ts b/src/buildx/install.ts index 04f0bbf..f206dc9 100644 --- a/src/buildx/install.ts +++ b/src/buildx/install.ts @@ -42,7 +42,7 @@ export class Install { constructor(opts?: InstallOpts) { this.context = opts?.context || new Context(); - this.standalone = opts?.standalone ?? !Docker.isAvailable; + this.standalone = opts?.standalone ?? !Docker.getInstance().available; } public async download(version: string, dest?: string): Promise { diff --git a/src/docker.ts b/src/docker.ts index 57acf2b..bf75a8a 100644 --- a/src/docker.ts +++ b/src/docker.ts @@ -20,36 +20,47 @@ import * as core from '@actions/core'; import * as exec from '@actions/exec'; export class Docker { + private static instance?: Docker; + static getInstance = (): Docker => (Docker.instance = Docker.instance ?? new Docker()); + + private _available: boolean | undefined; + + // eslint-disable-next-line @typescript-eslint/no-empty-function + private constructor() {} + static get configDir(): string { return process.env.DOCKER_CONFIG || path.join(os.homedir(), '.docker'); } - static get isAvailable(): boolean { - let dockerAvailable = false; - exec - .getExecOutput('docker', undefined, { - ignoreReturnCode: true, - silent: true - }) - .then(res => { - if (res.stderr.length > 0 && res.exitCode != 0) { - core.debug(`Docker.isAvailable error: ${res.stderr}`); - dockerAvailable = false; - } else { - core.debug(`Docker.isAvailable ok`); - dockerAvailable = res.exitCode == 0; - } - }) - // eslint-disable-next-line @typescript-eslint/no-unused-vars - .catch(error => { - core.debug(`Docker.isAvailable failed: ${error}`); - dockerAvailable = false; - }); - return dockerAvailable; + get available() { + return (async () => { + if (!this._available) { + this._available = await exec + .getExecOutput('docker', undefined, { + ignoreReturnCode: true, + silent: true + }) + .then(res => { + if (res.stderr.length > 0 && res.exitCode != 0) { + core.debug(`Docker.isAvailable error: ${res.stderr}`); + return false; + } else { + core.debug(`Docker.isAvailable ok`); + return res.exitCode == 0; + } + }) + // eslint-disable-next-line @typescript-eslint/no-unused-vars + .catch(error => { + core.debug(`Docker.isAvailable failed: ${error}`); + return false; + }); + } + return this._available; + })(); } public static async printVersion(standalone?: boolean): Promise { - const noDocker = standalone ?? !Docker.isAvailable; + const noDocker = standalone ?? !Docker.getInstance().available; if (noDocker) { core.debug('Docker.printVersion: Docker is not available, skipping.'); return; @@ -60,7 +71,7 @@ export class Docker { } public static async printInfo(standalone?: boolean): Promise { - const noDocker = standalone ?? !Docker.isAvailable; + const noDocker = standalone ?? !Docker.getInstance().available; if (noDocker) { core.debug('Docker.printInfo: Docker is not available, skipping.'); return; From 05bbe49fe189a73853da2258d5a852d604a1d687 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sat, 18 Feb 2023 07:06:29 +0100 Subject: [PATCH 2/2] toolkit: add docker Signed-off-by: CrazyMax --- src/toolkit.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/toolkit.ts b/src/toolkit.ts index 0c85436..86ad92c 100644 --- a/src/toolkit.ts +++ b/src/toolkit.ts @@ -20,6 +20,7 @@ import {Install} from './buildx/install'; import {Builder} from './buildx/builder'; import {BuildKit} from './buildkit/buildkit'; import {GitHub} from './github'; +import {Docker} from './docker'; export interface ToolkitOpts { /** @@ -32,6 +33,7 @@ export interface ToolkitOpts { export class Toolkit { public context: Context; public github: GitHub; + public docker: Docker; public buildx: Buildx; public buildxInstall: Install; public builder: Builder; @@ -40,7 +42,8 @@ export class Toolkit { constructor(opts: ToolkitOpts = {}) { this.context = new Context(); this.github = new GitHub({token: opts.githubToken}); - this.buildx = new Buildx({context: this.context}); + this.docker = Docker.getInstance(); + this.buildx = new Buildx({context: this.context, standalone: !this.docker.available}); this.buildxInstall = new Install({context: this.context, standalone: this.buildx.standalone}); this.builder = new Builder({context: this.context, buildx: this.buildx}); this.buildkit = new BuildKit({context: this.context, buildx: this.buildx});