From 9f5df5e5275082e1f24a805cbb46cedc4796b02d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 3 Nov 2021 14:47:09 -0400 Subject: [PATCH] Fixes (#856) * fix: avoid triggering %!/(MISSING) for docker output * fix: suppress --platform for empty platform Co-authored-by: Josh Soref --- act/container/docker_build.go | 6 +++++- act/container/docker_logger.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/act/container/docker_build.go b/act/container/docker_build.go index 8bf3466e..aaed1403 100644 --- a/act/container/docker_build.go +++ b/act/container/docker_build.go @@ -29,7 +29,11 @@ type NewDockerBuildExecutorInput struct { func NewDockerBuildExecutor(input NewDockerBuildExecutorInput) common.Executor { return func(ctx context.Context) error { logger := common.Logger(ctx) - logger.Infof("%sdocker build -t %s --platform %s %s", logPrefix, input.ImageTag, input.Platform, input.ContextDir) + if input.Platform != "" { + logger.Infof("%sdocker build -t %s --platform %s %s", logPrefix, input.ImageTag, input.Platform, input.ContextDir) + } else { + logger.Infof("%sdocker build -t %s %s", logPrefix, input.ImageTag, input.ContextDir) + } if common.Dryrun(ctx) { return nil } diff --git a/act/container/docker_logger.go b/act/container/docker_logger.go index c4b5e394..5c85785c 100644 --- a/act/container/docker_logger.go +++ b/act/container/docker_logger.go @@ -116,7 +116,7 @@ func logDockerResponse(logger logrus.FieldLogger, dockerResponse io.ReadCloser, writeLog(logger, isError, "%s :: %s\n", msg.Status, msg.ID) } } else if msg.Stream != "" { - writeLog(logger, isError, msg.Stream) + writeLog(logger, isError, "%s", msg.Stream) } else { writeLog(logger, false, "Unable to handle line: %s", string(line)) }