summaryrefslogtreecommitdiff
path: root/cmd/podman/inspect.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-02-10 11:57:05 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-11 10:21:46 +0000
commitd26266659d8649b36b91e8f8f78f8073007554ac (patch)
tree68f943994c26a639f23ba13fa7e024bbe204f41d /cmd/podman/inspect.go
parent773aa61f6622f52696434d883bb82c7d25125fd8 (diff)
downloadpodman-d26266659d8649b36b91e8f8f78f8073007554ac.tar.gz
podman-d26266659d8649b36b91e8f8f78f8073007554ac.tar.bz2
podman-d26266659d8649b36b91e8f8f78f8073007554ac.zip
Honor ENTRYPOINT in image
When an image has an ENTRYPOINT defined, we should be honoring it. The problem is described in issue #321. Also, added buildah binary to test runtimes for testing entrypoint and will also allow us to test podman build as well. Signed-off-by: baude <bbaude@redhat.com> Closes: #322 Approved by: rhatdan
Diffstat (limited to 'cmd/podman/inspect.go')
-rw-r--r--cmd/podman/inspect.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go
index ba7b17ed7..84107f3db 100644
--- a/cmd/podman/inspect.go
+++ b/cmd/podman/inspect.go
@@ -2,6 +2,7 @@ package main
import (
"encoding/json"
+ "strings"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
@@ -223,7 +224,7 @@ func getCtrInspectInfo(ctr *libpod.Container, ctrInspectData *inspect.ContainerI
OpenStdin: config.Stdin,
StopSignal: config.StopSignal,
Cmd: config.Spec.Process.Args,
- Entrypoint: createArtifact.Entrypoint,
+ Entrypoint: strings.Join(createArtifact.Entrypoint, " "),
},
}
return data, nil