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

buildx: use Buffer for base64 encoding of the Dockerfile
docker · Aug 7, 2024 · ded2f55 · ded2f55
2 parents 7c54753 + e979592
commit ded2f55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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 [email protected]
 COPy --from=base \

diff --git 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}`);