diff options
| author | baude <bbaude@redhat.com> | 2018-05-29 09:57:06 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-06-01 09:13:31 -0500 |
| commit | 62ea88fa193c116440740d3eb82977fd38de1a82 (patch) | |
| tree | 70feb8b7f3c50edb1a00c2c788a9559e46d9e7fc /pkg/varlinkapi/containers_create.go | |
| parent | ff3b46e769bc9a064ee8f45b9dbff8795d94bb7a (diff) | |
| download | podman-62ea88fa193c116440740d3eb82977fd38de1a82.tar.gz podman-62ea88fa193c116440740d3eb82977fd38de1a82.tar.bz2 podman-62ea88fa193c116440740d3eb82977fd38de1a82.zip | |
varlink build
Add the endpoint and methods for build so users can build an image
with varlink. build can also use the more method for streaming
output back more regularily; however, it looks like a bug in buildah
does not output all build output to the writer provided.
Tidy up some create fixes and add endpoint for GetImage requested by
jhonce.
Signed-off-by: baude <bbaude@redhat.com>
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...) } |