diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-23 19:15:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 19:15:20 +0100 |
| commit | c61802e69b59642be5c28f640f722596dd04fe5f (patch) | |
| tree | f4298eeec73cfa775cbd65bab7190da92f8465d4 /cmd/podman/common | |
| parent | 54d1329e431ba5b8c30cb2d80c1c33af7553b2b7 (diff) | |
| parent | c989c193bc78cb62c596677869bfa89d1b349bdc (diff) | |
| download | podman-c61802e69b59642be5c28f640f722596dd04fe5f.tar.gz podman-c61802e69b59642be5c28f640f722596dd04fe5f.tar.bz2 podman-c61802e69b59642be5c28f640f722596dd04fe5f.zip | |
Merge pull request #8440 from psakar/fix-8433
APIv2 - wrong command and args for created container
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index f34666fff..dc3202c7f 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -137,7 +137,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup aliases []string capAdd []string cappDrop []string - entrypoint string + entrypoint *string init bool specPorts []specgen.PortMapping ) @@ -181,13 +181,14 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup // marshall it to json; otherwise it should just be the string // value if len(cc.Config.Entrypoint) > 0 { - entrypoint = cc.Config.Entrypoint[0] + entrypoint = &cc.Config.Entrypoint[0] if len(cc.Config.Entrypoint) > 1 { b, err := json.Marshal(cc.Config.Entrypoint) if err != nil { return nil, nil, err } - entrypoint = string(b) + var jsonString = string(b) + entrypoint = &jsonString } } @@ -322,7 +323,7 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, cgroup DeviceReadIOPs: readIops, DeviceWriteBPs: writeBps, DeviceWriteIOPs: writeIops, - Entrypoint: &entrypoint, + Entrypoint: entrypoint, Env: cc.Config.Env, Expose: expose, GroupAdd: cc.HostConfig.GroupAdd, |