diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-08 12:40:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-08 12:40:23 -0400 |
commit | 343778f61ac38f0597cfbad38ace644035340f22 (patch) | |
tree | 0966f4a85c2d0ae975c5783051ca237f863c2408 /libpod | |
parent | cdbc33112ef6407db1292f0a40778e6ac1d8996e (diff) | |
parent | 0cebd158b6d8da1828b1255982e27fe9224310d0 (diff) | |
download | podman-343778f61ac38f0597cfbad38ace644035340f22.tar.gz podman-343778f61ac38f0597cfbad38ace644035340f22.tar.bz2 podman-343778f61ac38f0597cfbad38ace644035340f22.zip |
Merge pull request #13811 from flouthoc/container_inspect_entrypoint
container,inspect: convert `Entrypoint` to an array instead of a string
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/container_inspect.go | 2 | ||||
-rw-r--r-- | libpod/define/container_inspect.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index f2a2c2d16..c9d0b8a6c 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -367,7 +367,7 @@ func (c *Container) generateInspectContainerConfig(spec *spec.Spec) *define.Insp // Leave empty if not explicitly overwritten by user if len(c.config.Entrypoint) != 0 { - ctrConfig.Entrypoint = strings.Join(c.config.Entrypoint, " ") + ctrConfig.Entrypoint = c.config.Entrypoint } if len(c.config.Labels) != 0 { diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index ae2ce9724..444fbff62 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -44,7 +44,7 @@ type InspectContainerConfig struct { // Container working directory WorkingDir string `json:"WorkingDir"` // Container entrypoint - Entrypoint string `json:"Entrypoint"` + Entrypoint []string `json:"Entrypoint"` // On-build arguments - presently unused. More of Buildah's domain. OnBuild *string `json:"OnBuild"` // Container labels |