docker/actions-toolkit
1
0
Fork 0
mirror of https://github.com/docker/actions-toolkit.git synced 2024-11-23 11:36:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

docker: remove singleton

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2023-02-19 02:37:43 +01:00
parent 28c11a1819
commit cd825ae548
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
4 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/docker.test.ts
View File

@ -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,

2
src/buildx/buildx.ts
View File

@ -55,7 +55,7 @@ export class Buildx {
}
public async isStandalone(): Promise<boolean> {
const standalone = this._standalone ?? !(await Docker.getInstance().isAvailable());
const standalone = this._standalone ?? !(await Docker.isAvailable());
core.debug(`Buildx.isStandalone: ${standalone}`);
return standalone;
}

2
src/buildx/install.ts
View File

@ -143,7 +143,7 @@ export class Install {
}
private async isStandalone(): Promise<boolean> {
const standalone = this._standalone ?? !(await Docker.getInstance().isAvailable());
const standalone = this._standalone ?? !(await Docker.isAvailable());
core.debug(`Install.isStandalone: ${standalone}`);
return standalone;
}

36
src/docker.ts
View File

@ -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<boolean> {
if (this._available === undefined) {
await exec
public static async isAvailable(): Promise<boolean> {
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.available error: ${res.stderr}`);
this._available = false;
} else {
core.debug(`Docker.available ok`);
this._available = res.exitCode == 0;
core.debug(`Docker.isAvailable cmd err: ${res.stderr}`);
return false;
}
return 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.isAvailable error: ${error}`);
return false;
});
}
core.debug(`Docker.available: ${this._available}`);
return this._available ?? false;
core.debug(`Docker.isAvailable: ${ok}`);
return ok;
}
public static async printVersion(standalone?: boolean): Promise<void> {
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<void> {
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;