Merge pull request #417 from crazy-max/missing-dct-removal

missing DCT removal for a docker command
2024-07-19 16:24:23 +02:00 · 2024-07-19 16:19:38 +02:00 · 2024-07-19 16:18:17 +02:00 · 2024-07-19 13:31:32 +02:00 · 2024-07-19 13:25:38 +02:00 · 2024-07-19 10:30:23 +02:00
11 changed files with 258 additions and 83 deletions
--- a/.github/buildx-releases.json
+++ b/.github/buildx-releases.json
@@ -1,43 +1,84 @@
 {
  "latest": {
-    "id": 165067169,
-    "tag_name": "v0.16.0",
-    "html_url": "https://github.com/docker/buildx/releases/tag/v0.16.0",
+    "id": 166111587,
+    "tag_name": "v0.16.1",
+    "html_url": "https://github.com/docker/buildx/releases/tag/v0.16.1",
    "assets": [
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.darwin-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.darwin-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.darwin-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.darwin-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.darwin-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.darwin-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.provenance.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.sbom.json",
-      "https://github.com/docker/buildx/releases/download/v0.16.0/checksums.txt"
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-amd64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-amd64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-amd64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-arm64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-arm64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-arm64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/checksums.txt"
+    ]
+  },
+  "v0.16.1": {
+    "id": 166111587,
+    "tag_name": "v0.16.1",
+    "html_url": "https://github.com/docker/buildx/releases/tag/v0.16.1",
+    "assets": [
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-amd64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-amd64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-amd64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-arm64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-arm64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.darwin-arm64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.provenance.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.sbom.json",
+      "https://github.com/docker/buildx/releases/download/v0.16.1/checksums.txt"
    ]
  },
  "v0.16.0": {
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ on:

 env:
  NODE_VERSION: "20"
-  BUILDX_VERSION: "v0.16.0"
+  BUILDX_VERSION: "v0.16.1"
  BUILDKIT_IMAGE: "moby/buildkit:v0.15.0"

 jobs:
--- a/tests/docker/docker.test.itg.ts
+++ b/tests/docker/docker.test.itg.ts
@@ -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([
--- a/tests/docker/docker.test.ts
+++ b/tests/docker/docker.test.ts
@@ -22,7 +22,6 @@ import osm = require('os');
 import * as rimraf from 'rimraf';

 import {Docker} from '../../src/docker/docker';
-import {Exec} from '../../src/exec';

 import {ConfigFile} from '../../src/types/docker/docker';

@@ -105,48 +104,132 @@ describe('isAvailable', () => {
  });
 });

-describe('context', () => {
-  it('call docker context show', async () => {
-    const execSpy = jest.spyOn(Exec, 'getExecOutput');
-    await Docker.context().catch(() => {
-      // noop
-    });
-    expect(execSpy).toHaveBeenCalledWith(`docker`, ['context', 'inspect', '--format', '{{.Name}}'], {
+describe('exec', () => {
+  it('returns docker version', async () => {
+    const execSpy = jest.spyOn(Docker, 'exec');
+    await Docker.exec(['version'], {
      ignoreReturnCode: true,
      silent: true
    });
+    expect(execSpy).toHaveBeenCalledTimes(1);
+    const callfunc = execSpy.mock.calls[0];
+    expect(Object.keys(callfunc[1]?.env || {}).length).toBeGreaterThan(0);
+    const env = callfunc[1]?.env;
+    expect(env).toHaveProperty('DOCKER_CONTENT_TRUST');
+    expect(env?.DOCKER_CONTENT_TRUST).toBe('false');
+    if (callfunc[1]?.env) {
+      // already checked env
+      callfunc[1].env = undefined;
+    }
+    expect(callfunc).toEqual([
+      ['version'],
+      {
+        ignoreReturnCode: true,
+        silent: true
+      }
+    ]);
+  });
+});
+
+describe('getExecOutput', () => {
+  it('returns docker version', async () => {
+    const execSpy = jest.spyOn(Docker, 'getExecOutput');
+    await Docker.getExecOutput(['version'], {
+      ignoreReturnCode: true,
+      silent: true
+    });
+    expect(execSpy).toHaveBeenCalledTimes(1);
+    const callfunc = execSpy.mock.calls[0];
+    expect(Object.keys(callfunc[1]?.env || {}).length).toBeGreaterThan(0);
+    const env = callfunc[1]?.env;
+    expect(env).toHaveProperty('DOCKER_CONTENT_TRUST');
+    expect(env?.DOCKER_CONTENT_TRUST).toBe('false');
+    if (callfunc[1]?.env) {
+      // already checked env
+      callfunc[1].env = undefined;
+    }
+    expect(callfunc).toEqual([
+      ['version'],
+      {
+        ignoreReturnCode: true,
+        silent: true
+      }
+    ]);
+  });
+});
+
+describe('context', () => {
+  it('call docker context show', async () => {
+    const execSpy = jest.spyOn(Docker, 'getExecOutput');
+    await Docker.context().catch(() => {
+      // noop
+    });
+    expect(execSpy).toHaveBeenCalledTimes(1);
+    const callfunc = execSpy.mock.calls[0];
+    if (callfunc && callfunc[1]) {
+      // we don't want to check env opt
+      callfunc[1].env = undefined;
+    }
+    expect(callfunc).toEqual([
+      ['context', 'inspect', '--format', '{{.Name}}'],
+      {
+        ignoreReturnCode: true,
+        silent: true
+      }
+    ]);
  });
 });

 describe('contextInspect', () => {
  it('call docker context inspect', async () => {
-    const execSpy = jest.spyOn(Exec, 'getExecOutput');
+    const execSpy = jest.spyOn(Docker, 'getExecOutput');
    await Docker.contextInspect('foo').catch(() => {
      // noop
    });
-    expect(execSpy).toHaveBeenCalledWith(`docker`, ['context', 'inspect', '--format=json', 'foo'], {
-      ignoreReturnCode: true,
-      silent: true
-    });
+    expect(execSpy).toHaveBeenCalledTimes(1);
+    const callfunc = execSpy.mock.calls[0];
+    if (callfunc && callfunc[1]) {
+      // we don't want to check env opt
+      callfunc[1].env = undefined;
+    }
+    expect(callfunc).toEqual([
+      ['context', 'inspect', '--format=json', 'foo'],
+      {
+        ignoreReturnCode: true,
+        silent: true
+      }
+    ]);
  });
 });

 describe('printVersion', () => {
  it('call docker version', async () => {
-    const execSpy = jest.spyOn(Exec, 'exec');
+    const execSpy = jest.spyOn(Docker, 'exec');
    await Docker.printVersion().catch(() => {
      // noop
    });
-    expect(execSpy).toHaveBeenCalledWith(`docker`, ['version']);
+    expect(execSpy).toHaveBeenCalledTimes(1);
+    const callfunc = execSpy.mock.calls[0];
+    if (callfunc && callfunc[1]) {
+      // we don't want to check env opt
+      callfunc[1].env = undefined;
+    }
+    expect(callfunc).toEqual([['version']]);
  });
 });

 describe('printInfo', () => {
  it('call docker info', async () => {
-    const execSpy = jest.spyOn(Exec, 'exec');
+    const execSpy = jest.spyOn(Docker, 'exec');
    await Docker.printInfo().catch(() => {
      // noop
    });
-    expect(execSpy).toHaveBeenCalledWith(`docker`, ['info']);
+    expect(execSpy).toHaveBeenCalledTimes(1);
+    const callfunc = execSpy.mock.calls[0];
+    if (callfunc && callfunc[1]) {
+      // we don't want to check env opt
+      callfunc[1].env = undefined;
+    }
+    expect(callfunc).toEqual([['info']]);
  });
 });
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -16,7 +16,7 @@

 ARG NODE_VERSION=20
 ARG DOCKER_VERSION=26.0.2
-ARG BUILDX_VERSION=0.16.0
+ARG BUILDX_VERSION=0.16.1

 FROM node:${NODE_VERSION}-alpine AS base
 RUN apk add --no-cache cpio findutils git
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
    "he": "^1.2.0",
    "js-yaml": "^4.1.0",
    "jwt-decode": "^4.0.0",
-    "semver": "^7.6.2",
+    "semver": "^7.6.3",
    "tar-stream": "^3.1.7",
    "tmp": "^0.2.3"
  },
--- a/src/buildkit/buildkit.ts
+++ b/src/buildkit/buildkit.ts
@@ -19,8 +19,8 @@ import * as semver from 'semver';

 import {Buildx} from '../buildx/buildx';
 import {Builder} from '../buildx/builder';
+import {Docker} from '../docker/docker';
 import {Config} from './config';
-import {Exec} from '../exec';

 import {BuilderInfo, NodeInfo} from '../types/buildx/builder';

@@ -51,13 +51,13 @@ export class BuildKit {

  private async getVersionWithinImage(nodeName: string): Promise<string> {
    core.debug(`BuildKit.getVersionWithinImage nodeName: ${nodeName}`);
-    return Exec.getExecOutput(`docker`, ['inspect', '--format', '{{.Config.Image}}', `${Buildx.containerNamePrefix}${nodeName}`], {
+    return Docker.getExecOutput(['inspect', '--format', '{{.Config.Image}}', `${Buildx.containerNamePrefix}${nodeName}`], {
      ignoreReturnCode: true,
      silent: true
    }).then(bkitimage => {
      if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
        core.debug(`BuildKit.getVersionWithinImage image: ${bkitimage.stdout.trim()}`);
-        return Exec.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
+        return Docker.getExecOutput(['run', '--rm', bkitimage.stdout.trim(), '--version'], {
          ignoreReturnCode: true,
          silent: true
        }).then(bkitversion => {
--- a/src/buildx/history.ts
+++ b/src/buildx/history.ts
@@ -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');
    }
@@ -137,7 +140,11 @@ export class History {
      ]
      core.info(`[command]docker ${dockerRunArgs.join(' ')}`);
      dockerRunProc = spawn('docker', dockerRunArgs, {
-        stdio: ['pipe', 'pipe', 'inherit']
+        stdio: ['pipe', 'pipe', 'inherit'],
+        env: {
+          ...process.env,
+          DOCKER_CONTENT_TRUST: 'false'
+        }
      });
      fs.createReadStream(buildxOutFifoPath).pipe(dockerRunProc.stdin);
      dockerRunProc.stdout.pipe(fs.createWriteStream(buildxInFifoPath));
--- a/src/docker/docker.ts
+++ b/src/docker/docker.ts
@@ -18,6 +18,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import * as core from '@actions/core';
+import {ExecOptions, ExecOutput} from '@actions/exec';
 import * as io from '@actions/io';

 import {Context} from '../context';
@@ -53,12 +54,47 @@ 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));
+  }
+
+  public static async getExecOutput(args?: string[], options?: ExecOptions): Promise<ExecOutput> {
+    return Exec.getExecOutput('docker', args, Docker.execOptions(options));
+  }
+
+  private static execOptions(options?: ExecOptions): ExecOptions {
+    if (!options) {
+      options = {};
+    }
+    if (!options.env) {
+      options.env = Object.assign({}, process.env, {
+        DOCKER_CONTENT_TRUST: 'false'
+      }) as {
+        [key: string]: string;
+      };
+    } else {
+      options.env.DOCKER_CONTENT_TRUST = 'false';
+    }
+    return options;
+  }
+
  public static async context(name?: string): Promise<string> {
    const args = ['context', 'inspect', '--format', '{{.Name}}'];
    if (name) {
      args.push(name);
    }
-    return await Exec.getExecOutput(`docker`, args, {
+    return await Docker.getExecOutput(args, {
      ignoreReturnCode: true,
      silent: true
    }).then(res => {
@@ -74,7 +110,7 @@ export class Docker {
    if (name) {
      args.push(name);
    }
-    return await Exec.getExecOutput(`docker`, args, {
+    return await Docker.getExecOutput(args, {
      ignoreReturnCode: true,
      silent: true
    }).then(res => {
@@ -86,11 +122,11 @@ export class Docker {
  }

  public static async printVersion(): Promise<void> {
-    await Exec.exec('docker', ['version']);
+    await Docker.exec(['version']);
  }

  public static async printInfo(): Promise<void> {
-    await Exec.exec('docker', ['info']);
+    await Docker.exec(['info']);
  }

  public static parseRepoTag(image: string): {repository: string; tag: string} {
@@ -138,7 +174,7 @@ export class Docker {
      cacheFoundPath = await imageCache.find();
      if (cacheFoundPath) {
        core.info(`Image found from cache in ${cacheFoundPath}`);
-        await Exec.getExecOutput(`docker`, ['load', '-i', cacheFoundPath], {
+        await Docker.getExecOutput(['load', '-i', cacheFoundPath], {
          ignoreReturnCode: true
        }).then(res => {
          if (res.stderr.length > 0 && res.exitCode != 0) {
@@ -149,7 +185,7 @@ export class Docker {
    }

    let pulled = true;
-    await Exec.getExecOutput(`docker`, ['pull', image], {
+    await Docker.getExecOutput(['pull', image], {
      ignoreReturnCode: true
    }).then(res => {
      if (res.stderr.length > 0 && res.exitCode != 0) {
@@ -165,7 +201,7 @@ export class Docker {

    if (cache && pulled) {
      const imageTarPath = path.join(Context.tmpDir(), `${Util.hash(image)}.tar`);
-      await Exec.getExecOutput(`docker`, ['save', '-o', imageTarPath, image], {
+      await Docker.getExecOutput(['save', '-o', imageTarPath, image], {
        ignoreReturnCode: true
      }).then(async res => {
        if (res.stderr.length > 0 && res.exitCode != 0) {
--- a/src/docker/install.ts
+++ b/src/docker/install.ts
@@ -28,6 +28,7 @@ import * as io from '@actions/io';
 import * as tc from '@actions/tool-cache';

 import {Context} from '../context';
+import {Docker} from './docker';
 import {Exec} from '../exec';
 import {Util} from '../util';
 import {limaYamlData, dockerServiceLogsPs1, setupDockerWinPs1} from './assets';
@@ -219,8 +220,8 @@ export class Install {
    });

    await core.group('Create Docker context', async () => {
-      await Exec.exec('docker', ['context', 'create', this.contextName, '--docker', `host=${dockerHost}`]);
-      await Exec.exec('docker', ['context', 'use', this.contextName]);
+      await Docker.exec(['context', 'create', this.contextName, '--docker', `host=${dockerHost}`]);
+      await Docker.exec(['context', 'use', this.contextName]);
    });

    return dockerHost;
@@ -288,7 +289,8 @@ EOF`,
            await Exec.getExecOutput(`docker version`, undefined, {
              silent: true,
              env: Object.assign({}, envs, {
-                DOCKER_HOST: dockerHost
+                DOCKER_HOST: dockerHost,
+                DOCKER_CONTENT_TRUST: 'false'
              }) as {
                [key: string]: string;
              }
@@ -309,8 +311,8 @@ EOF`,
    });

    await core.group('Create Docker context', async () => {
-      await Exec.exec('docker', ['context', 'create', this.contextName, '--docker', `host=${dockerHost}`]);
-      await Exec.exec('docker', ['context', 'use', this.contextName]);
+      await Docker.exec(['context', 'create', this.contextName, '--docker', `host=${dockerHost}`]);
+      await Docker.exec(['context', 'use', this.contextName]);
    });

    return dockerHost;
@@ -352,8 +354,8 @@ EOF`,
    });

    await core.group('Create Docker context', async () => {
-      await Exec.exec('docker', ['context', 'create', this.contextName, '--docker', `host=${dockerHost}`]);
-      await Exec.exec('docker', ['context', 'use', this.contextName]);
+      await Docker.exec(['context', 'create', this.contextName, '--docker', `host=${dockerHost}`]);
+      await Docker.exec(['context', 'use', this.contextName]);
    });

    return dockerHost;
@@ -395,7 +397,7 @@ EOF`,
      await Exec.exec('limactl', ['delete', '--tty=false', this.limaInstanceName, '--force']);
    });
    await core.group('Removing Docker context', async () => {
-      await Exec.exec('docker', ['context', 'rm', '-f', this.contextName]);
+      await Docker.exec(['context', 'rm', '-f', this.contextName]);
    });
    await core.group(`Cleaning up runDir`, async () => {
      await Exec.exec('sudo', ['rm', '-rf', this.runDir]);
@@ -411,7 +413,7 @@ EOF`,
      await Util.sleep(5);
    });
    await core.group('Removing Docker context', async () => {
-      await Exec.exec('docker', ['context', 'rm', '-f', this.contextName]);
+      await Docker.exec(['context', 'rm', '-f', this.contextName]);
    });
    await core.group(`Cleaning up runDir`, async () => {
      await Exec.exec('sudo', ['rm', '-rf', this.runDir], {
@@ -427,7 +429,7 @@ EOF`,
      await Exec.exec(logCmd.command, logCmd.args);
    });
    await core.group('Removing Docker context', async () => {
-      await Exec.exec('docker', ['context', 'rm', '-f', this.contextName]);
+      await Docker.exec(['context', 'rm', '-f', this.contextName]);
    });
  }

--- a/yarn.lock
+++ b/yarn.lock
@@ -1136,7 +1136,7 @@ __metadata:
    jwt-decode: ^4.0.0
    prettier: ^3.2.5
    rimraf: ^5.0.5
-    semver: ^7.6.2
+    semver: ^7.6.3
    tar-stream: ^3.1.7
    tmp: ^0.2.3
    ts-jest: ^29.1.2
@@ -7406,12 +7406,12 @@ __metadata:
  languageName: node
  linkType: hard

-"semver@npm:^7.6.2":
-  version: 7.6.2
-  resolution: "semver@npm:7.6.2"
+"semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
  bin:
    semver: bin/semver.js
-  checksum: 40f6a95101e8d854357a644da1b8dd9d93ce786d5c6a77227bc69dbb17bea83d0d1d1d7c4cd5920a6df909f48e8bd8a5909869535007f90278289f2451d0292d
+  checksum: 4110ec5d015c9438f322257b1c51fe30276e5f766a3f64c09edd1d7ea7118ecbc3f379f3b69032bacf13116dc7abc4ad8ce0d7e2bd642e26b0d271b56b61a7d8
  languageName: node
  linkType: hard
Author	SHA1	Message	Date
CrazyMax	6df98c1aad	Merge pull request #417 from crazy-max/missing-dct-removal Some checks failed publish / publish (push) Has been cancelled Details missing DCT removal for a docker command	2024-07-19 16:24:23 +02:00
CrazyMax	a9bd3f5b6b	missing DCT removal for a docker command Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-07-19 16:19:38 +02:00
CrazyMax	f7a8b21610	Merge pull request #416 from crazy-max/docker-daemon-up buildx(history): check docker daemon is running before exporting	2024-07-19 16:18:17 +02:00
CrazyMax	8177e153d6	buildx(history): check docker daemon is running before exporting Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-07-19 13:31:32 +02:00
CrazyMax	a14ead6486	docker: isDaemonRunning func Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-07-19 13:25:38 +02:00
CrazyMax	f9de623b1d	Merge pull request #415 from tonistiigi/update-buildx-v0.16.1 update buildx to v0.16.1	2024-07-19 10:30:23 +02:00
Tonis Tiigi	202104bf16	update buildx to v0.16.1 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>	2024-07-18 14:55:07 -07:00
Tõnis Tiigi	b6b4cf170e	Merge pull request #414 from docker/bot/buildx-releases-json Update `.github/buildx-releases.json`	2024-07-18 14:53:09 -07:00
tonistiigi	311ae1dacc	github: update .github/buildx-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-07-18 21:51:28 +00:00
CrazyMax	163d33a2bd	Merge pull request #412 from crazy-max/docker-disable-dct Some checks failed publish / publish (push) Has been cancelled Details disable DCT for docker commands	2024-07-17 14:07:19 +02:00
CrazyMax	d283be916f	Merge pull request #413 from docker/dependabot/npm_and_yarn/semver-7.6.3 build(deps): bump semver from 7.6.2 to 7.6.3	2024-07-17 13:55:39 +02:00
dependabot[bot]	ffc7d98a98	build(deps): bump semver from 7.6.2 to 7.6.3 Bumps [semver](https://github.com/npm/node-semver) from 7.6.2 to 7.6.3. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.6.2...v7.6.3) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-16 22:29:08 +00:00
CrazyMax	d36bef4156	disable DCT for docker commands Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-07-16 17:17:24 +02:00