Merge pull request #428 from crazy-max/buildx-fix-convert-warnings

buildx: use Buffer for base64 encoding of the Dockerfile
2024-08-07 20:40:32 +02:00 · 2024-08-07 20:29:42 +02:00 · 2024-08-02 09:16:38 +02:00 · 2024-08-02 09:15:51 +02:00 · 2024-08-02 00:15:36 +00:00 · 2024-08-01 22:04:50 +00:00
5 changed files with 51 additions and 7 deletions
--- a/.github/buildx-lab-releases.json
+++ b/.github/buildx-lab-releases.json
@@ -40,6 +40,47 @@
      "https://github.com/docker/buildx-desktop/releases/download/v0.15.1-desktop.1/checksums.txt"
    ]
  },
+  "v0.16.2-desktop.1": {
+    "id": 168239569,
+    "tag_name": "v0.16.2-desktop.1",
+    "html_url": "https://github.com/docker/buildx-desktop/releases/tag/v0.16.2-desktop.1",
+    "assets": [
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.darwin-amd64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.darwin-amd64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.darwin-amd64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.darwin-arm64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.darwin-arm64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.darwin-arm64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-amd64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-amd64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-amd64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm-v6",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm-v6.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm-v6.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm-v7",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm-v7.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm-v7.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-arm64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-ppc64le",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-ppc64le.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-ppc64le.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-riscv64",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-riscv64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-riscv64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-s390x",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-s390x.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.linux-s390x.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.windows-amd64.exe",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.windows-amd64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.windows-amd64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.windows-arm64.exe",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.windows-arm64.provenance.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/buildx-v0.16.2-desktop.1.windows-arm64.sbom.json",
+      "https://github.com/docker/buildx-desktop/releases/download/v0.16.2-desktop.1/checksums.txt"
+    ]
+  },
  "v0.15.1-desktop.1": {
    "id": 161492089,
    "tag_name": "v0.15.1-desktop.1",
--- a/tests/.fixtures/lint.Dockerfile
+++ b/tests/.fixtures/lint.Dockerfile
@@ -17,6 +17,9 @@
 frOM busybox as base
 cOpy lint.Dockerfile .

+# some special chars: distroless/python3-debian12のPythonは3.11
+# https://github.com/docker/build-push-action/issues/1204#issuecomment-2274056016
+
 from scratch
 MAINTAINER moby@example.com
 COPy --from=base \
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
    "registry": "https://registry.npmjs.org/"
  },
  "dependencies": {
-    "@actions/artifact": "^2.1.8",
+    "@actions/artifact": "^2.1.9",
    "@actions/cache": "^3.2.4",
    "@actions/core": "^1.10.1",
    "@actions/exec": "^1.1.1",
--- a/src/buildx/buildx.ts
+++ b/src/buildx/buildx.ts
@@ -347,7 +347,7 @@ export class Buildx {
      if (Util.isPathRelativeTo(workspaceDir, ls.DockerfilePath)) {
        dockerfiles.push({
          path: path.relative(workspaceDir, ls.DockerfilePath),
-          content: btoa(fs.readFileSync(ls.DockerfilePath, {encoding: 'utf-8'}))
+          content: Buffer.from(fs.readFileSync(ls.DockerfilePath, {encoding: 'utf-8'}), 'utf-8').toString('base64')
        });
      } else {
        core.debug(`Buildx.convertWarningsToGitHubAnnotations: skipping Dockerfile outside of workspace: ${ls.DockerfilePath}`);
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,9 +12,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@actions/artifact@npm:^2.1.8":
-  version: 2.1.8
-  resolution: "@actions/artifact@npm:2.1.8"
+"@actions/artifact@npm:^2.1.9":
+  version: 2.1.9
+  resolution: "@actions/artifact@npm:2.1.9"
  dependencies:
    "@actions/core": ^1.10.0
    "@actions/github": ^5.1.1
@@ -30,7 +30,7 @@ __metadata:
    jwt-decode: ^3.1.2
    twirp-ts: ^2.5.0
    unzip-stream: ^0.3.1
-  checksum: 51a47c21bcdac705abb61dbaef923f2760354c39bcad44a31b129e18bf31f646e5148f92ee7e1198275d1dba7bebfd1d1500ad7f62f6de1e65b57b2d092d5341
+  checksum: b01404aa6b4d47186e04a64c0002100ff68a8473eafb811a3d49275a7e1135d1981ccaf527b81c4856f6da764beabe7489fd296bb287906fd7c1964dfaeef3df
  languageName: node
  linkType: hard

@@ -1099,7 +1099,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@docker/actions-toolkit@workspace:."
  dependencies:
-    "@actions/artifact": ^2.1.8
+    "@actions/artifact": ^2.1.9
    "@actions/cache": ^3.2.4
    "@actions/core": ^1.10.1
    "@actions/exec": ^1.1.1
Author	SHA1	Message	Date
CrazyMax	ded2f5536d	Merge pull request #428 from crazy-max/buildx-fix-convert-warnings Some checks failed publish / publish (push) Has been cancelled Details buildx: use Buffer for base64 encoding of the Dockerfile	2024-08-07 20:40:32 +02:00
CrazyMax	e97959223c	buildx: use Buffer for base64 encoding of the Dockerfile Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>	2024-08-07 20:29:42 +02:00
CrazyMax	7c54753700	Merge pull request #426 from docker/dependabot/npm_and_yarn/actions/artifact-2.1.9 build(deps): bump @actions/artifact from 2.1.8 to 2.1.9	2024-08-02 09:16:38 +02:00
CrazyMax	ebf0787efa	Merge pull request #427 from docker/bot/buildx-lab-releases-json Update `.github/buildx-lab-releases.json`	2024-08-02 09:15:51 +02:00
crazy-max	f751af96ee	github: update .github/buildx-lab-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-08-02 00:15:36 +00:00
dependabot[bot]	1f95d41238	build(deps): bump @actions/artifact from 2.1.8 to 2.1.9 Bumps [@actions/artifact](https://github.com/actions/toolkit/tree/HEAD/packages/artifact) from 2.1.8 to 2.1.9. - [Changelog](https://github.com/actions/toolkit/blob/main/packages/artifact/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/artifact) --- updated-dependencies: - dependency-name: "@actions/artifact" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-01 22:04:50 +00:00