do not attach the action container stdout/stderr to the current process

when tink-worker is configured with --capture-action-logs=false the action container stdout/stderr must not be attached to the current process. that configuration is used when there is an existing docker log-driver, which will capture all the containers logs without tink-worker help. this prevents the action container logs from being duplicated in the tink-worker container logs and in the action container docker logs. Signed-off-by: Rui Lopes <[email protected]>
tinkerbell · Oct 9, 2021 · c362740 · c362740
1 parent e8019c9
commit c362740
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmd/tink-worker/Dockerfile b/cmd/tink-worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.14
 ENTRYPOINT [ "/usr/bin/tink-worker" ]
 
 ARG TARGETARCH

diff --git a/cmd/tink-worker/internal/action.go b/cmd/tink-worker/internal/action.go
@@ -31,8 +31,8 @@ func (w *Worker) createContainer(ctx context.Context, cmd []string, wfID string,
 		Env:          action.GetEnvironment(),
 	}
 	if !captureLogs {
-		config.AttachStdout = true
-		config.AttachStderr = true
+		config.AttachStdout = false
+		config.AttachStderr = false
 		config.Tty = false
 	}