diff --git a/__tests__/docker.test.ts b/__tests__/docker.test.ts index 8823e43..593df08 100644 --- a/__tests__/docker.test.ts +++ b/__tests__/docker.test.ts @@ -50,7 +50,7 @@ describe('configDir', () => { describe('isAvailable', () => { it('cli', async () => { const execSpy = jest.spyOn(exec, 'getExecOutput'); - await Docker.getInstance().isAvailable(); + await Docker.isAvailable(); // 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 7ca3208..5568d22 100644 --- a/src/buildx/buildx.ts +++ b/src/buildx/buildx.ts @@ -55,7 +55,7 @@ export class Buildx { } public async isStandalone(): Promise { - const standalone = this._standalone ?? !(await Docker.getInstance().isAvailable()); + const standalone = this._standalone ?? !(await Docker.isAvailable()); core.debug(`Buildx.isStandalone: ${standalone}`); return standalone; } diff --git a/src/buildx/install.ts b/src/buildx/install.ts index f8f87ee..2e790db 100644 --- a/src/buildx/install.ts +++ b/src/buildx/install.ts @@ -143,7 +143,7 @@ export class Install { } private async isStandalone(): Promise { - const standalone = this._standalone ?? !(await Docker.getInstance().isAvailable()); + const standalone = this._standalone ?? !(await Docker.isAvailable()); core.debug(`Install.isStandalone: ${standalone}`); return standalone; } diff --git a/src/docker.ts b/src/docker.ts index 25e205d..3f5a02a 100644 --- a/src/docker.ts +++ b/src/docker.ts @@ -20,46 +20,34 @@ 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'); } - public async isAvailable(): Promise { - if (this._available === undefined) { - await exec - .getExecOutput('docker', undefined, { - ignoreReturnCode: true, - silent: true - }) - .then(res => { - if (res.stderr.length > 0 && res.exitCode != 0) { - core.debug(`Docker.available error: ${res.stderr}`); - this._available = false; - } else { - core.debug(`Docker.available ok`); - this._available = res.exitCode == 0; - } - }) - // eslint-disable-next-line @typescript-eslint/no-unused-vars - .catch(error => { - core.debug(`Docker.available failed: ${error}`); - this._available = false; - }); - } - core.debug(`Docker.available: ${this._available}`); - return this._available ?? false; + public static async isAvailable(): Promise { + const ok: boolean = await exec + .getExecOutput('docker', undefined, { + ignoreReturnCode: true, + silent: true + }) + .then(res => { + if (res.stderr.length > 0 && res.exitCode != 0) { + core.debug(`Docker.isAvailable cmd err: ${res.stderr}`); + return false; + } + return res.exitCode == 0; + }) + .catch(error => { + core.debug(`Docker.isAvailable error: ${error}`); + return false; + }); + + core.debug(`Docker.isAvailable: ${ok}`); + return ok; } public static async printVersion(standalone?: boolean): Promise { - const noDocker = standalone ?? !(await Docker.getInstance().isAvailable()); + const noDocker = standalone ?? !(await Docker.isAvailable()); if (noDocker) { core.debug('Docker.printVersion: Docker is not available, skipping.'); return; @@ -70,7 +58,7 @@ export class Docker { } public static async printInfo(standalone?: boolean): Promise { - const noDocker = standalone ?? !(await Docker.getInstance().isAvailable()); + const noDocker = standalone ?? !(await Docker.isAvailable()); if (noDocker) { core.debug('Docker.printInfo: Docker is not available, skipping.'); return;