opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 13:38:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3888 from jwhonce/wip/api

Browse Source 
Update varlink doc and code for images
This commit is contained in:
OpenShift Merge Robot
2019-08-27 11:43:24 +02:00
committed by GitHub
parent cec354aac9 02cda4066d
commit f221c61019
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
API.md
View File

@ -1361,6 +1361,8 @@ pids [int](https://godoc.org/builtin#int)
### <a name="Create"></a>type Create ### <a name="Create"></a>type Create
Create is an input structure for creating containers. Create is an input structure for creating containers.
args[0] is the image name or id
args[1-] are the new commands if changed
args [[]string](#[]string) args [[]string](#[]string)

2
cmd/podman/shared/create.go
View File

@ -81,7 +81,7 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
if len(c.InputArgs) != 0 { if len(c.InputArgs) != 0 {
name = c.InputArgs[0] name = c.InputArgs[0]
} else { } else {
return nil, nil, errors.Errorf("error, no input arguments were provided") return nil, nil, errors.Errorf("error, image name not provided")
} }
pullType, err := util.ValidatePullType(c.String("pull")) pullType, err := util.ValidatePullType(c.String("pull"))

2
cmd/podman/varlink/io.podman.varlink
View File

@ -274,6 +274,8 @@ type Sockets(
) )
# Create is an input structure for creating containers. # Create is an input structure for creating containers.
# args[0] is the image name or id
# args[1-] are the new commands if changed
type Create ( type Create (
args: []string, args: []string,
addHost: ?[]string, addHost: ?[]string,

9
pkg/varlinkapi/images.go
View File

@ -360,7 +360,12 @@ func (i *LibpodAPI) PushImage(call iopodman.VarlinkCall, name, tag string, compr
output := bytes.NewBuffer([]byte{}) output := bytes.NewBuffer([]byte{})
c := make(chan error) c := make(chan error)
go func() { go func() {
err := newImage.PushImageToHeuristicDestination(getContext(), destname, manifestType, "", "", "", output, compress, so, &dockerRegistryOptions, nil) writer := bytes.NewBuffer([]byte{})
err := newImage.PushImageToHeuristicDestination(getContext(), destname, manifestType, "", "", "", writer, compress, so, &dockerRegistryOptions, nil)
if err != nil {
c <- err
}
_, err = io.CopyBuffer(output, writer, nil)
c <- err c <- err
close(c) close(c)
}() }()
@ -388,6 +393,7 @@ func (i *LibpodAPI) PushImage(call iopodman.VarlinkCall, name, tag string, compr
} }
br := iopodman.MoreResponse{ br := iopodman.MoreResponse{
Logs: log, Logs: log,
Id: newImage.ID(),
} }
call.ReplyPushImage(br) call.ReplyPushImage(br)
log = []string{} log = []string{}
@ -403,6 +409,7 @@ func (i *LibpodAPI) PushImage(call iopodman.VarlinkCall, name, tag string, compr
br := iopodman.MoreResponse{ br := iopodman.MoreResponse{
Logs: log, Logs: log,
Id: newImage.ID(),
} }
return call.ReplyPushImage(br) return call.ReplyPushImage(br)
} }