Переглянути джерело

Merge pull request #9020 from daehyeok/log_exec

Add exec event log
Alexander Morozov 10 роки тому
батько
коміт
7eb5262d1b

+ 4 - 0
daemon/exec.go

@@ -154,6 +154,8 @@ func (d *Daemon) ContainerExecCreate(job *engine.Job) engine.Status {
 		Running:       false,
 	}
 
+	container.LogEvent("exec_create: " + execConfig.ProcessConfig.Entrypoint + " " + strings.Join(execConfig.ProcessConfig.Arguments, " "))
+
 	d.registerExecCommand(execConfig)
 
 	job.Printf("%s\n", execConfig.ID)
@@ -192,6 +194,8 @@ func (d *Daemon) ContainerExecStart(job *engine.Job) engine.Status {
 	log.Debugf("starting exec command %s in container %s", execConfig.ID, execConfig.Container.ID)
 	container := execConfig.Container
 
+	container.LogEvent("exec_start: " + execConfig.ProcessConfig.Entrypoint + " " + strings.Join(execConfig.ProcessConfig.Arguments, " "))
+
 	if execConfig.OpenStdin {
 		r, w := io.Pipe()
 		go func() {

+ 1 - 1
docs/sources/reference/api/docker_remote_api_v1.17.md

@@ -1380,7 +1380,7 @@ polling (using since).
 
 Docker containers will report the following events:
 
-    create, destroy, die, export, kill, oom, pause, restart, start, stop, unpause
+    create, destroy, die, exec_create, exec_start, export, kill, oom, pause, restart, start, stop, unpause
 
 and Docker images will report: