diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-15 12:17:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 12:17:12 +0200 |
| commit | 3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7 (patch) | |
| tree | fc635fda5032a7054f562025b4152ac54ba20f85 /pkg/varlinkapi/images.go | |
| parent | d5db2af340b94b9900cf194e35d57af40a695fe1 (diff) | |
| parent | 146c68f3acdc01f393a6cfadf9bc98eec3e8de94 (diff) | |
| download | podman-3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7.tar.gz podman-3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7.tar.bz2 podman-3b4ad9a81d7c2d194f4d3f2686d47d78857b65d7.zip | |
Merge pull request #7452 from jwhonce/issues/7136
Refactor API build endpoint to be more compliant
Diffstat (limited to 'pkg/varlinkapi/images.go')
| -rw-r--r-- | pkg/varlinkapi/images.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 1dcfa2213..4bcf70b0d 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -23,7 +23,7 @@ import ( "github.com/containers/podman/v2/libpod" "github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/libpod/image" - "github.com/containers/podman/v2/pkg/channelwriter" + "github.com/containers/podman/v2/pkg/channel" "github.com/containers/podman/v2/pkg/util" iopodman "github.com/containers/podman/v2/pkg/varlink" "github.com/containers/podman/v2/utils" @@ -570,7 +570,7 @@ func (i *VarlinkAPI) Commit(call iopodman.VarlinkCall, name, imageName string, c log []string mimeType string ) - output := channelwriter.NewChannelWriter() + output := channel.NewWriter(make(chan []byte)) channelClose := func() { if err := output.Close(); err != nil { logrus.Errorf("failed to close channel writer: %q", err) @@ -704,7 +704,7 @@ func (i *VarlinkAPI) PullImage(call iopodman.VarlinkCall, name string, creds iop if call.WantsMore() { call.Continues = true } - output := channelwriter.NewChannelWriter() + output := channel.NewWriter(make(chan []byte)) channelClose := func() { if err := output.Close(); err != nil { logrus.Errorf("failed to close channel writer: %q", err) |