From 80b642ff881d21ba6d006b8e52458335462d05b6 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 19 Dec 2016 15:18:06 -0500
Subject: [PATCH] Ignore the daemon log config when building images.
Logs created by build containers should be handled by the daemon, not by logging drivers.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
builder/dockerfile/builder.go | 2 ++
builder/dockerfile/dispatchers.go | 6 +++++-
builder/dockerfile/internals.go | 8 +++++++-
daemon/workdir.go | 2 +-
integration-cli/docker_cli_daemon_test.go | 13 +++++++++++++
5 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/builder/dockerfile/builder.go b/builder/dockerfile/builder.go
index 9464c52ca4..7f2544ef99 100644
--- a/builder/dockerfile/builder.go
+++ b/builder/dockerfile/builder.go
@@ -49,6 +49,8 @@ var BuiltinAllowedBuildArgs = map[string]bool{
"no_proxy": true,
}
+var defaultLogConfig = container.LogConfig{Type: "none"}
+
// Builder is a Dockerfile builder
// It implements the builder.Backend interface.
type Builder struct {
diff --git a/builder/dockerfile/dispatchers.go b/builder/dockerfile/dispatchers.go
index 16333fe95a..598a5d0618 100644
--- a/builder/dockerfile/dispatchers.go
+++ b/builder/dockerfile/dispatchers.go
@@ -308,7 +308,11 @@ func workdir(b *Builder, args []string, attributes map[string]bool, original str
return nil
}
- container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig})
+ container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{
+ Config: b.runConfig,
+ // Set a log config to override any default value set on the daemon
+ HostConfig: &container.HostConfig{LogConfig: defaultLogConfig},
+ })
if err != nil {
return err
}
diff --git a/builder/dockerfile/internals.go b/builder/dockerfile/internals.go
index a611774237..890f0af1ad 100644
--- a/builder/dockerfile/internals.go
+++ b/builder/dockerfile/internals.go
@@ -181,7 +181,11 @@ func (b *Builder) runContextCommand(args []string, allowRemote bool, allowLocalD
return nil
}
- container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig})
+ container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{
+ Config: b.runConfig,
+ // Set a log config to override any default value set on the daemon
+ HostConfig: &container.HostConfig{LogConfig: defaultLogConfig},
+ })
if err != nil {
return err
}
@@ -489,6 +493,8 @@ func (b *Builder) create() (string, error) {
ShmSize: b.options.ShmSize,
Resources: resources,
NetworkMode: container.NetworkMode(b.options.NetworkMode),
+ // Set a log config to override any default value set on the daemon
+ LogConfig: defaultLogConfig,
}
config := *b.runConfig
diff --git a/daemon/workdir.go b/daemon/workdir.go
index 5bd0d0caca..99a2a8ea57 100644
--- a/daemon/workdir.go
+++ b/daemon/workdir.go
@@ -1,6 +1,6 @@
package daemon
-// ContainerCreateWorkdir creates the working directory. This is solves the
+// ContainerCreateWorkdir creates the working directory. This solves the
// issue arising from https://github.com/docker/docker/issues/27545,
// which was initially fixed by https://github.com/docker/docker/pull/27884. But that fix
// was too expensive in terms of performance on Windows. Instead,
diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go
index 68ad15fc4e..6187415754 100644
--- a/integration-cli/docker_cli_daemon_test.go
+++ b/integration-cli/docker_cli_daemon_test.go
@@ -1134,6 +1134,19 @@ func (s *DockerDaemonSuite) TestDaemonLoggingDriverNoneLogsError(c *check.C) {
c.Assert(out, checker.Contains, expected)
}
+func (s *DockerDaemonSuite) TestDaemonLoggingDriverShouldBeIgnoredForBuild(c *check.C) {
+ s.d.StartWithBusybox(c, "--log-driver=splunk")
+
+ out, err := s.d.Cmd("build")
+ out, code, err := s.d.BuildImageWithOut("busyboxs", `
+ FROM busybox
+ RUN echo foo`, false)
+ comment := check.Commentf("Failed to build image. output %s, exitCode %d, err %v", out, code, err)
+ c.Assert(err, check.IsNil, comment)
+ c.Assert(code, check.Equals, 0, comment)
+ c.Assert(out, checker.Contains, "foo", comment)
+}
+
func (s *DockerDaemonSuite) TestDaemonUnixSockCleanedUp(c *check.C) {
dir, err := ioutil.TempDir("", "socket-cleanup-test")
if err != nil {