Merge pull request #2803 from nalind/bud-no-terminal

imagebuildah: disable pseudo-terminals for RUN
containers · Nov 17, 2020 · 60813b5 · 60813b5
2 parents 05aa527 + e863665
commit 60813b5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/imagebuildah/stage_executor.go b/imagebuildah/stage_executor.go
@@ -368,6 +368,7 @@ func (s *StageExecutor) Run(run imagebuilder.Run, config docker.Config) error {
 		Stderr:           s.executor.err,
 		Quiet:            s.executor.quiet,
 		NamespaceOptions: s.executor.namespaceOptions,
+		Terminal:         buildah.WithoutTerminal,
 	}
 	if config.NetworkDisabled {
 		options.ConfigureNetwork = buildah.NetworkDisabled

diff --git a/tests/bud.bats b/tests/bud.bats
@@ -2384,3 +2384,7 @@ EOF
   run cmp tar1 url1
   [[ "$status" -ne 0 ]]
 }
+
+@test "bud-terminal" {
+  run_buildah bud ${TESTSDIR}/bud/terminal
+}
diff --git a/tests/bud/terminal/Dockerfile b/tests/bud/terminal/Dockerfile
@@ -0,0 +1,2 @@
+FROM busybox
+RUN ! tty