Skip to content

Commit

Permalink
Merge pull request #416 from crazy-max/docker-daemon-up
Browse files Browse the repository at this point in the history
buildx(history): check docker daemon is running before exporting
  • Loading branch information
crazy-max authored Jul 19, 2024
2 parents f9de623 + 8177e15 commit f7a8b21
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
6 changes: 6 additions & 0 deletions __tests__/docker/docker.test.itg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ import {Docker} from '../../src/docker/docker';

const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;

maybe('isDaemonRunning', () => {
it('checks if daemon is running', async () => {
expect(await Docker.isDaemonRunning()).toBe(true);
});
});

maybe('pull', () => {
// prettier-ignore
test.each([
Expand Down
3 changes: 3 additions & 0 deletions src/buildx/history.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export class History {
if (!(await Docker.isAvailable())) {
throw new Error('Docker is required to export a build record');
}
if (!(await Docker.isDaemonRunning())) {
throw new Error('Docker daemon is not running, skipping build record export');
}
if (!(await this.buildx.versionSatisfies('>=0.13.0'))) {
throw new Error('Buildx >= 0.13.0 is required to export a build record');
}
Expand Down
11 changes: 11 additions & 0 deletions src/docker/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ export class Docker {
});
}

public static async isDaemonRunning(): Promise<boolean> {
try {
await Docker.getExecOutput([`version`], {
silent: true
});
return true;
} catch (e) {
return false;
}
}

public static async exec(args?: string[], options?: ExecOptions): Promise<number> {
return Exec.exec('docker', args, Docker.execOptions(options));
}
Expand Down

0 comments on commit f7a8b21

Please sign in to comment.