diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-04-28 12:20:10 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-04-30 11:33:34 +0200 |
| commit | c11cff4542a3e8b1b14086601b219310ed0f7f1b (patch) | |
| tree | e509c794fd6c8b1b553bf78d68927bc7ac515188 /pkg/specgen/generate/oci.go | |
| parent | 32564df172659dd844c0bd72671468f058f964de (diff) | |
| download | podman-c11cff4542a3e8b1b14086601b219310ed0f7f1b.tar.gz podman-c11cff4542a3e8b1b14086601b219310ed0f7f1b.tar.bz2 podman-c11cff4542a3e8b1b14086601b219310ed0f7f1b.zip | |
cmd, podman: do not override entrypoint if unset
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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 |