summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-15 09:23:57 -0500
committerGitHub <noreply@github.com>2021-01-15 09:23:57 -0500
commit5a166b297339d547d89fbf14248c3aff129eb960 (patch)
tree9c9e7f88b2e1dab42f525177ffda6a170b6e7454 /cmd/podman
parent3ceef004e3848d5fbddcf084c0db3f1ebe789312 (diff)
parentc88022589aa3aa10593e7956cdf52d9e231f254d (diff)
downloadpodman-5a166b297339d547d89fbf14248c3aff129eb960.tar.gz
podman-5a166b297339d547d89fbf14248c3aff129eb960.tar.bz2
podman-5a166b297339d547d89fbf14248c3aff129eb960.zip
Merge pull request #8978 from rhatdan/buildah
Bump to containers/buildah 1.9.2
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/images/build.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index c0aa27ca1..1029e03d1 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -404,7 +404,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
AddCapabilities: flags.CapAdd,
AdditionalTags: tags,
Annotations: flags.Annotation,
- Architecture: flags.Arch,
Args: args,
BlobDirectory: flags.BlobCache,
CNIConfigDir: flags.CNIConfigDir,
@@ -439,7 +438,6 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
Layers: flags.Layers,
NamespaceOptions: nsValues,
NoCache: flags.NoCache,
- OS: flags.OS,
Out: stdout,
Output: output,
OutputFormat: format,