summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-21 10:50:45 -0400
committerGitHub <noreply@github.com>2020-10-21 10:50:45 -0400
commitf96dbd0896eac8730142cf694485543275764195 (patch)
treee5dcc1e5e0505e37adf1b3f75a37158f7aef04f6
parent287edd4e214f09a695ceb074c14f8b72f6695e1f (diff)
parentd72918fe6f19a080892df5f3e87d96d35b7720f4 (diff)
downloadpodman-f96dbd0896eac8730142cf694485543275764195.tar.gz
podman-f96dbd0896eac8730142cf694485543275764195.tar.bz2
podman-f96dbd0896eac8730142cf694485543275764195.zip
Merge pull request #8092 from rhatdan/stdin
Podman build should default to not usins stdin
-rw-r--r--cmd/podman/images/build.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index ac1b2c848..aa4e87952 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -282,8 +282,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
flags.Layers = false
}
- var stdin, stdout, stderr, reporter *os.File
- stdin = os.Stdin
+ var stdout, stderr, reporter *os.File
stdout = os.Stdout
stderr = os.Stderr
reporter = os.Stderr
@@ -422,7 +421,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
ForceRmIntermediateCtrs: flags.ForceRm,
IDMappingOptions: idmappingOptions,
IIDFile: flags.Iidfile,
- In: stdin,
Isolation: isolation,
Labels: flags.Label,
Layers: flags.Layers,