diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 07:54:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 07:54:39 -0400 |
| commit | 08823e738381a64952580e08188f6edc7bb9e3f0 (patch) | |
| tree | 511f67b86baa3748e3e6551b48aeb04958504718 /cmd | |
| parent | 47d99fb6253238e7603fc96d5b9bbb14f1e8c948 (diff) | |
| parent | 75fdb753ddb47d51df1f9781d5db0748edd738da (diff) | |
| download | podman-08823e738381a64952580e08188f6edc7bb9e3f0.tar.gz podman-08823e738381a64952580e08188f6edc7bb9e3f0.tar.bz2 podman-08823e738381a64952580e08188f6edc7bb9e3f0.zip | |
Merge pull request #5913 from rhatdan/v2
More fixes for podman create tests
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/specgen.go | 2 | ||||
| -rw-r--r-- | cmd/podman/images/inspect.go | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 1eb8fc0bd..4e2ce1e34 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -268,6 +268,8 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string var command []string + s.Entrypoint = entrypoint + // Build the command // If we have an entry point, it goes first if len(entrypoint) > 0 { diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go index 11bef02ba..3190ab725 100644 --- a/cmd/podman/images/inspect.go +++ b/cmd/podman/images/inspect.go @@ -84,10 +84,14 @@ func inspect(cmd *cobra.Command, args []string) error { } } + var lastErr error for id, e := range results.Errors { - fmt.Fprintf(os.Stderr, "%s: %s\n", id, e.Error()) + if lastErr != nil { + fmt.Fprintf(os.Stderr, "%s: %s\n", id, lastErr.Error()) + } + lastErr = e } - return nil + return lastErr } func inspectFormat(row string) string { |