diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-26 11:41:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 11:41:58 +0100 |
| commit | e5e447debc0e011913e4389041e1561a5119a7eb (patch) | |
| tree | 40442bea6f028bd7c68ccd417b5df26f2b608730 /cmd/podman/common/create_opts.go | |
| parent | 79565d1af18f07754e067b7203f42122d8fc03a9 (diff) | |
| parent | 5623cb9d3d722a7015a395b31ce9ee7d9954bed9 (diff) | |
| download | podman-e5e447debc0e011913e4389041e1561a5119a7eb.tar.gz podman-e5e447debc0e011913e4389041e1561a5119a7eb.tar.bz2 podman-e5e447debc0e011913e4389041e1561a5119a7eb.zip | |
Merge pull request #9084 from rhatdan/override
Fix --arch and --os flags to work correctly
Diffstat (limited to 'cmd/podman/common/create_opts.go')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index f252618ce..a4da8da9e 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -73,9 +73,9 @@ type ContainerCLIOpts struct { NoHealthCheck bool OOMKillDisable bool OOMScoreAdj int - OverrideArch string - OverrideOS string - OverrideVariant string + Arch string + OS string + Variant string PID string PIDsLimit *int64 Platform string @@ -346,9 +346,9 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup LogOptions: stringMaptoArray(cc.HostConfig.LogConfig.Config), Name: cc.Name, OOMScoreAdj: cc.HostConfig.OomScoreAdj, - OverrideArch: "", - OverrideOS: "", - OverrideVariant: "", + Arch: "", + OS: "", + Variant: "", PID: string(cc.HostConfig.PidMode), PIDsLimit: cc.HostConfig.PidsLimit, Privileged: cc.HostConfig.Privileged, |