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

buildx: use Buffer for base64 encoding of the Dockerfile
This commit is contained in:
CrazyMax 2024-08-07 20:40:32 +02:00 committed by GitHub
commit ded2f5536d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions

View File

@ -17,6 +17,9 @@
frOM busybox as base frOM busybox as base
cOpy lint.Dockerfile . 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 from scratch
MAINTAINER moby@example.com MAINTAINER moby@example.com
COPy --from=base \ COPy --from=base \

View File

@ -347,7 +347,7 @@ export class Buildx {
if (Util.isPathRelativeTo(workspaceDir, ls.DockerfilePath)) { if (Util.isPathRelativeTo(workspaceDir, ls.DockerfilePath)) {
dockerfiles.push({ dockerfiles.push({
path: path.relative(workspaceDir, ls.DockerfilePath), 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 { } else {
core.debug(`Buildx.convertWarningsToGitHubAnnotations: skipping Dockerfile outside of workspace: ${ls.DockerfilePath}`); core.debug(`Buildx.convertWarningsToGitHubAnnotations: skipping Dockerfile outside of workspace: ${ls.DockerfilePath}`);