diff options
| author | Aditya R <arajan@redhat.com> | 2022-04-22 00:47:10 +0530 |
|---|---|---|
| committer | Aditya R <arajan@redhat.com> | 2022-04-22 00:58:40 +0530 |
| commit | 8080a5f8ec8ad798eab194ef495a68824bd2e802 (patch) | |
| tree | 3ce0106afbfbdbfb55f018a662329c0025a889f9 /libpod | |
| parent | 121dde6234ddfcaf11abea03449bfd2a11da90a5 (diff) | |
| download | podman-8080a5f8ec8ad798eab194ef495a68824bd2e802.tar.gz podman-8080a5f8ec8ad798eab194ef495a68824bd2e802.tar.bz2 podman-8080a5f8ec8ad798eab194ef495a68824bd2e802.zip | |
Revert "container,inspect: convert Entrypoint to array instead of a string"
It seems this breaks older version of `podman-remote` users hence it
looks like this patch would be a better candidate for podman `5.0`
Problem
* Client with `4.0` cannot interact with a server of `4.1`
Plan this patch for podman `5.0`
This reverts commit 0cebd158b6d8da1828b1255982e27fe9224310d0.
Signed-off-by: Aditya R <arajan@redhat.com>
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 14290ca0d..735790411 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 = c.config.Entrypoint + ctrConfig.Entrypoint = strings.Join(c.config.Entrypoint, " ") } if len(c.config.Labels) != 0 { diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 444fbff62..ae2ce9724 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 |