diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-01 15:32:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 15:32:00 +0200 |
| commit | 1230499e45554069f3e6ad073f7e1b0083787213 (patch) | |
| tree | 1b135430cd6cde13b663d47f2ee4712dbc001d87 /pkg/specgen/generate/oci.go | |
| parent | 2f3762eb911258016581187f072a24ac2724be3b (diff) | |
| parent | aef7836b38570eb48bd0fd1c1c4ca37e9a9022f4 (diff) | |
| download | podman-1230499e45554069f3e6ad073f7e1b0083787213.tar.gz podman-1230499e45554069f3e6ad073f7e1b0083787213.tar.bz2 podman-1230499e45554069f3e6ad073f7e1b0083787213.zip | |
Merge pull request #6016 from giuseppe/fix-create
v2, podman: fix create and entrypoint tests
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 87262684e..f0b4d1111 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -67,7 +67,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image finalCommand = append(finalCommand, entrypoint...) command := s.Command - if len(command) == 0 && img != nil { + if command == nil && img != nil { newCmd, err := img.Cmd(ctx) if err != nil { return nil, err |