diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-01 13:00:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 13:00:30 -0400 |
| commit | 8c68fddd1c0b08d7f8c04f1a3fca3ca3f5d2f786 (patch) | |
| tree | 01741607733c138abb6a45ab184e7dd411a9591c /pkg/varlinkapi/containers_create.go | |
| parent | 3c63a48bb8c1bdff688ce5b6c9c6e3079370e603 (diff) | |
| parent | 62ea88fa193c116440740d3eb82977fd38de1a82 (diff) | |
| download | podman-8c68fddd1c0b08d7f8c04f1a3fca3ca3f5d2f786.tar.gz podman-8c68fddd1c0b08d7f8c04f1a3fca3ca3f5d2f786.tar.bz2 podman-8c68fddd1c0b08d7f8c04f1a3fca3ca3f5d2f786.zip | |
Merge pull request #839 from baude/varlinkcreatefixes
varlink build
Diffstat (limited to 'pkg/varlinkapi/containers_create.go')
| -rw-r--r-- | pkg/varlinkapi/containers_create.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index 24edb05b8..40bd92e9a 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -22,14 +22,6 @@ import ( // CreateContainer ... func (i *LibpodAPI) CreateContainer(call ioprojectatomicpodman.VarlinkCall, config ioprojectatomicpodman.Create) error { - //mappings, err := util.ParseIDMapping(config.Uidmap, config.Gidmap, config.Subuidmap, config.Subgidmap) - //if err != nil { - // return err - //} - //storageOpts := storage.DefaultStoreOptions - //storageOpts.UIDMap = mappings.UIDMap - //storageOpts.GIDMap = mappings.GIDMap - runtime, err := libpodruntime.GetRuntime(i.Cli) if err != nil { return call.ReplyRuntimeError(err.Error()) @@ -120,7 +112,7 @@ func varlinkCreateToCreateConfig(ctx context.Context, create ioprojectatomicpodm if len(inputCommand) > 0 { // User command overrides data CMD command = append(command, inputCommand...) - } else if len(data.ContainerConfig.Cmd) > 0 && len(create.Entrypoint) > 0 { + } else if len(data.ContainerConfig.Cmd) > 0 && len(command) == 0 { // If not user command, add CMD command = append(command, data.ContainerConfig.Cmd...) } |