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
7 changed files with 102 additions and 40 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/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/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');
    }
--- a/src/docker/docker.ts
+++ b/src/docker/docker.ts
@@ -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));
  }
--- a/src/docker/install.ts
+++ b/src/docker/install.ts
@@ -289,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;
              }
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