[hyper-provider] update hypercli in vendor

This commit is contained in:
Jimmy Xu
2017-12-22 00:30:03 +08:00
parent 1b3d6eae82
commit a6a6267863
200 changed files with 451 additions and 675 deletions

View File

@@ -1,3 +0,0 @@
bundles
.gopath
vendor/pkg

View File

@@ -1,42 +0,0 @@
# Docker project generated files to ignore
# if you want to ignore files created by your editor/tools,
# please consider a global .gitignore https://help.github.com/articles/ignoring-files
*.exe
*.exe~
*.orig
*.test
.*.swp
.DS_Store
.bashrc
.dotcloud
.flymake*
.git/
.gopath/
.hg/
.vagrant*
Vagrantfile
a.out
autogen/
bin
build_src
bundles/
docker/docker
hyper/hyper
dockerversion/version_autogen.go
docs/AWS_S3_BUCKET
docs/GITCOMMIT
docs/GIT_BRANCH
docs/VERSION
docs/_build
docs/_static
docs/_templates
docs/changed-files
# generated by man/md2man-all.sh
man/man1
man/man5
man/man8
pyenv
vendor/pkg/
*.yml
.idea
integration-cli/util.conf

View File

@@ -1,171 +0,0 @@
# Generate AUTHORS: hack/generate-authors.sh
# Tip for finding duplicates (besides scanning the output of AUTHORS for name
# duplicates that aren't also email duplicates): scan the output of:
# git log --format='%aE - %aN' | sort -uf
#
# For explanation on this file format: man git-shortlog
Patrick Stapleton <github@gdi2290.com>
Shishir Mahajan <shishir.mahajan@redhat.com> <smahajan@redhat.com>
Erwin van der Koogh <info@erronis.nl>
Ahmed Kamal <email.ahmedkamal@googlemail.com>
Tejesh Mehta <tejesh.mehta@gmail.com> <tj@init.me>
Cristian Staretu <cristian.staretu@gmail.com>
Cristian Staretu <cristian.staretu@gmail.com> <unclejacksons@gmail.com>
Cristian Staretu <cristian.staretu@gmail.com> <unclejack@users.noreply.github.com>
Marcus Linke <marcus.linke@gmx.de>
Aleksandrs Fadins <aleks@s-ko.net>
Christopher Latham <sudosurootdev@gmail.com>
Hu Keping <hukeping@huawei.com>
Wayne Chang <wayne@neverfear.org>
Chen Chao <cc272309126@gmail.com>
Daehyeok Mun <daehyeok@gmail.com>
<daehyeok@gmail.com> <daehyeok@daehyeokui-MacBook-Air.local>
<jt@yadutaf.fr> <admin@jtlebi.fr>
<jeff@docker.com> <jefferya@programmerq.net>
<charles.hooper@dotcloud.com> <chooper@plumata.com>
<daniel.mizyrycki@dotcloud.com> <daniel@dotcloud.com>
<daniel.mizyrycki@dotcloud.com> <mzdaniel@glidelink.net>
Guillaume J. Charmes <guillaume.charmes@docker.com> <charmes.guillaume@gmail.com>
<guillaume.charmes@docker.com> <guillaume@dotcloud.com>
<guillaume.charmes@docker.com> <guillaume@docker.com>
<guillaume.charmes@docker.com> <guillaume.charmes@dotcloud.com>
<guillaume.charmes@docker.com> <guillaume@charmes.net>
<kencochrane@gmail.com> <KenCochrane@gmail.com>
Thatcher Peskens <thatcher@docker.com>
Thatcher Peskens <thatcher@docker.com> <thatcher@dotcloud.com>
Thatcher Peskens <thatcher@docker.com> dhrp <thatcher@gmx.net>
Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> jpetazzo <jerome.petazzoni@dotcloud.com>
Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> <jp@enix.org>
Joffrey F <joffrey@docker.com>
Joffrey F <joffrey@docker.com> <joffrey@dotcloud.com>
Joffrey F <joffrey@docker.com> <f.joffrey@gmail.com>
Tim Terhorst <mynamewastaken+git@gmail.com>
Andy Smith <github@anarkystic.com>
<kalessin@kalessin.fr> <louis@dotcloud.com>
<victor.vieux@docker.com> <victor.vieux@dotcloud.com>
<victor.vieux@docker.com> <victor@dotcloud.com>
<victor.vieux@docker.com> <dev@vvieux.com>
<victor.vieux@docker.com> <victor@docker.com>
<victor.vieux@docker.com> <vieux@docker.com>
<victor.vieux@docker.com> <victorvieux@gmail.com>
<dominik@honnef.co> <dominikh@fork-bomb.org>
<ehanchrow@ine.com> <eric.hanchrow@gmail.com>
Walter Stanish <walter@pratyeka.org>
<daniel@gasienica.ch> <dgasienica@zynga.com>
Roberto Hashioka <roberto_hashioka@hotmail.com>
Konstantin Pelykh <kpelykh@zettaset.com>
David Sissitka <me@dsissitka.com>
Nolan Darilek <nolan@thewordnerd.info>
<mastahyeti@gmail.com> <mastahyeti@users.noreply.github.com>
Benoit Chesneau <bchesneau@gmail.com>
Jordan Arentsen <blissdev@gmail.com>
Daniel Garcia <daniel@danielgarcia.info>
Miguel Angel Fernández <elmendalerenda@gmail.com>
Bhiraj Butala <abhiraj.butala@gmail.com>
Faiz Khan <faizkhan00@gmail.com>
Victor Lyuboslavsky <victor@victoreda.com>
Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Matthew Mueller <mattmuelle@gmail.com>
<mosoni@ebay.com> <mohitsoni1989@gmail.com>
Shih-Yuan Lee <fourdollars@gmail.com>
Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com> root <root@vagrant-ubuntu-12.10.vagrantup.com>
Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>
<proppy@google.com> <proppy@aminche.com>
<michael@docker.com> <michael@crosbymichael.com>
<michael@docker.com> <crosby.michael@gmail.com>
<michael@docker.com> <crosbymichael@gmail.com>
<github@developersupport.net> <github@metaliveblog.com>
<brandon@ifup.org> <brandon@ifup.co>
<dano@spotify.com> <daniel.norberg@gmail.com>
<danny@codeaholics.org> <Danny.Yates@mailonline.co.uk>
<gurjeet@singh.im> <singh.gurjeet@gmail.com>
<shawn@churchofgit.com> <shawnlandden@gmail.com>
<sjoerd-github@linuxonly.nl> <sjoerd@byte.nl>
<solomon@docker.com> <solomon.hykes@dotcloud.com>
<solomon@docker.com> <solomon@dotcloud.com>
<solomon@docker.com> <s@docker.com>
Sven Dowideit <SvenDowideit@home.org.au>
Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@fosiki.com>
Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@docker.com>
Sven Dowideit <SvenDowideit@home.org.au> <¨SvenDowideit@home.org.au¨>
Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@users.noreply.github.com>
Sven Dowideit <SvenDowideit@home.org.au> <sven@t440s.home.gateway>
<alexl@redhat.com> <alexander.larsson@gmail.com>
Alexandr Morozov <lk4d4math@gmail.com>
<git.nivoc@neverbox.com> <kuehnle@online.de>
O.S. Tezer <ostezer@gmail.com>
<ostezer@gmail.com> <ostezer@users.noreply.github.com>
Roberto G. Hashioka <roberto.hashioka@docker.com> <roberto_hashioka@hotmail.com>
<justin.p.simonelis@gmail.com> <justin.simonelis@PTS-JSIMON2.toronto.exclamation.com>
<taim@bosboot.org> <maztaim@users.noreply.github.com>
<viktor.vojnovski@amadeus.com> <vojnovski@gmail.com>
<vbatts@redhat.com> <vbatts@hashbangbash.com>
<altsysrq@gmail.com> <iamironbob@gmail.com>
Sridhar Ratnakumar <sridharr@activestate.com>
Sridhar Ratnakumar <sridharr@activestate.com> <github@srid.name>
Liang-Chi Hsieh <viirya@gmail.com>
Aleksa Sarai <cyphar@cyphar.com>
Will Weaver <monkey@buildingbananas.com>
Timothy Hobbs <timothyhobbs@seznam.cz>
Nathan LeClaire <nathan.leclaire@docker.com> <nathan.leclaire@gmail.com>
Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
<github@hollensbe.org> <erik+github@hollensbe.org>
<github@albersweb.de> <albers@users.noreply.github.com>
<lsm5@fedoraproject.org> <lsm5@redhat.com>
<marc@marc-abramowitz.com> <msabramo@gmail.com>
Matthew Heon <mheon@redhat.com> <mheon@mheonlaptop.redhat.com>
<bernat@luffy.cx> <vincent@bernat.im>
<p@pwaller.net> <peter@scraperwiki.com>
<andrew.weiss@outlook.com> <andrew.weiss@microsoft.com>
Francisco Carriedo <fcarriedo@gmail.com>
<julienbordellier@gmail.com> <git@julienbordellier.com>
<ahmetb@microsoft.com> <ahmetalpbalkan@gmail.com>
<lk4d4@docker.com> <lk4d4math@gmail.com>
<arnaud.porterie@docker.com> <icecrime@gmail.com>
<baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
Brian Goff <cpuguy83@gmail.com>
<cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.home>
<ewindisch@docker.com> <eric@windisch.us>
<frank.rosquin+github@gmail.com> <frank.rosquin@gmail.com>
Hollie Teal <hollie@docker.com>
<hollie@docker.com> <hollie.teal@docker.com>
<hollie@docker.com> <hollietealok@users.noreply.github.com>
<huu@prismskylabs.com> <whoshuu@gmail.com>
Jessica Frazelle <jess@docker.com> Jessie Frazelle <jfrazelle@users.noreply.github.com>
<jess@docker.com> <jfrazelle@users.noreply.github.com>
<konrad.wilhelm.kleine@gmail.com> <kwk@users.noreply.github.com>
<tintypemolly@gmail.com> <tintypemolly@Ohui-MacBook-Pro.local>
<estesp@linux.vnet.ibm.com> <estesp@gmail.com>
<github@gone.nl> <thaJeztah@users.noreply.github.com>
Thomas LEVEIL <thomasleveil@gmail.com> Thomas LÉVEIL <thomasleveil@users.noreply.github.com>
<oi@truffles.me.uk> <timruffles@googlemail.com>
<Vincent.Bernat@exoscale.ch> <bernat@luffy.cx>
Antonio Murdaca <antonio.murdaca@gmail.com> <me@runcom.ninja>
Antonio Murdaca <antonio.murdaca@gmail.com> <runcom@linux.com>
Antonio Murdaca <antonio.murdaca@gmail.com> <runcom@users.noreply.github.com>
Darren Shepherd <darren.s.shepherd@gmail.com> <darren@rancher.com>
Deshi Xiao <dxiao@redhat.com> <dsxiao@dataman-inc.com>
Deshi Xiao <dxiao@redhat.com> <xiaods@gmail.com>
Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
Jacob Atzen <jacob@jacobatzen.dk> <jatzen@gmail.com>
Jeff Nickoloff <jeff.nickoloff@gmail.com> <jeff@allingeek.com>
<jess@docker.com> <princess@docker.com>
John Howard (VM) <John.Howard@microsoft.com> John Howard <jhoward@microsoft.com>
Madhu Venugopal <madhu@socketplane.io> <madhu@docker.com>
Mary Anthony <mary.anthony@docker.com> <mary@docker.com>
Mary Anthony <mary.anthony@docker.com> moxiegirl <mary@docker.com>
Mary Anthony <mary.anthony@docker.com> <moxieandmore@gmail.com>
mattyw <mattyw@me.com> <gh@mattyw.net>
resouer <resouer@163.com> <resouer@gmail.com>
AJ Bowen <aj@gandi.net> soulshake <amy@gandi.net>
AJ Bowen <aj@gandi.net> soulshake <aj@gandi.net>
Tibor Vass <teabee89@gmail.com> <tibor@docker.com>
Tibor Vass <teabee89@gmail.com> <tiborvass@users.noreply.github.com>
Vincent Bernat <bernat@luffy.cx> <Vincent.Bernat@exoscale.ch>
Yestin Sun <sunyi0804@gmail.com> <yestin.sun@polyera.com>
bin liu <liubin0329@users.noreply.github.com> <liubin0329@gmail.com>
John Howard (VM) <John.Howard@microsoft.com> jhowardmsft <jhoward@microsoft.com>
Ankush Agarwal <ankushagarwal11@gmail.com> <ankushagarwal@users.noreply.github.com>
Tangi COLIN <tangicolin@gmail.com> tangicolin <tangicolin@gmail.com>

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/signal"

View File

@@ -14,8 +14,8 @@ import (
"runtime"
"strings"
"github.com/docker/engine-api/types"
"github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/builder/dockerignore"
Cli "github.com/hyperhq/hypercli/cli"

View File

@@ -9,9 +9,9 @@ import (
"os"
"runtime"
"github.com/docker/engine-api/client"
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/cliconfig"

View File

@@ -4,8 +4,8 @@ import (
"encoding/json"
"fmt"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -10,9 +10,9 @@ import (
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/archive"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -9,10 +9,10 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
networktypes "github.com/docker/engine-api/types/network"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
networktypes "github.com/hyperhq/hyper-api/types/network"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
"github.com/hyperhq/hypercli/reference"

View File

@@ -7,12 +7,12 @@ import (
"text/tabwriter"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/docker/engine-api/types/strslice"
"github.com/docker/go-connections/nat"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hyper-api/types/strslice"
Cli "github.com/hyperhq/hypercli/cli"
ropts "github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -8,8 +8,8 @@ import (
"net/http"
"net/url"
"github.com/docker/engine-api/types/events"
"github.com/gorilla/websocket"
"github.com/hyperhq/hyper-api/types/events"
signutil "github.com/hyperhq/websocket-client/go/util"
"golang.org/x/net/context"
)

View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/promise"

View File

@@ -5,8 +5,8 @@ import (
"io/ioutil"
"testing"
"github.com/hyperhq/hyper-api/types"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/docker/engine-api/types"
)
type arguments struct {
@@ -15,12 +15,12 @@ type arguments struct {
func TestParseExec(t *testing.T) {
invalids := map[*arguments]error{
&arguments{[]string{"-unknown"}}: fmt.Errorf("flag provided but not defined: -unknown"),
&arguments{[]string{"-u"}}: fmt.Errorf("flag needs an argument: -u"),
&arguments{[]string{"--user"}}: fmt.Errorf("flag needs an argument: --user"),
{[]string{"-unknown"}}: fmt.Errorf("flag provided but not defined: -unknown"),
{[]string{"-u"}}: fmt.Errorf("flag needs an argument: -u"),
{[]string{"--user"}}: fmt.Errorf("flag needs an argument: --user"),
}
valids := map[*arguments]*types.ExecConfig{
&arguments{
{
[]string{"container", "command"},
}: {
Container: "container",
@@ -28,7 +28,7 @@ func TestParseExec(t *testing.T) {
AttachStdout: true,
AttachStderr: true,
},
&arguments{
{
[]string{"container", "command1", "command2"},
}: {
Container: "container",
@@ -36,7 +36,7 @@ func TestParseExec(t *testing.T) {
AttachStdout: true,
AttachStderr: true,
},
&arguments{
{
[]string{"-i", "-t", "-u", "uid", "container", "command"},
}: {
User: "uid",
@@ -47,7 +47,7 @@ func TestParseExec(t *testing.T) {
Container: "container",
Cmd: []string{"command"},
},
&arguments{
{
[]string{"-d", "container", "command"},
}: {
AttachStdin: false,
@@ -57,7 +57,7 @@ func TestParseExec(t *testing.T) {
Container: "container",
Cmd: []string{"command"},
},
&arguments{
{
[]string{"-t", "-i", "-d", "container", "command"},
}: {
AttachStdin: false,

View File

@@ -10,8 +10,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -6,8 +6,8 @@ import (
"strings"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/pkg/stringid"
"github.com/hyperhq/hypercli/pkg/stringutils"

View File

@@ -6,8 +6,8 @@ import (
"testing"
"time"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/stringid"
"github.com/docker/engine-api/types"
)
func TestContainerPsContext(t *testing.T) {

View File

@@ -8,7 +8,7 @@ import (
"text/tabwriter"
"text/template"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/reference"
)

View File

@@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
)
func TestContainerContextWrite(t *testing.T) {

View File

@@ -11,13 +11,13 @@ import (
"text/tabwriter"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/docker/engine-api/types/strslice"
"github.com/docker/go-connections/nat"
units "github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hyper-api/types/strslice"
Cli "github.com/hyperhq/hypercli/cli"
ropts "github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -4,8 +4,8 @@ import (
"io"
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/stdcopy"
"github.com/docker/engine-api/types"
)
func (cli *DockerCli) holdHijackedConnection(tty bool, inputStream io.ReadCloser, outputStream, errorStream io.Writer, resp types.HijackedResponse) error {

View File

@@ -1,8 +1,8 @@
package client
import (
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hypercli/api/client/formatter"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
"github.com/hyperhq/hypercli/pkg/jsonmessage"

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/client"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hypercli/api/client/inspect"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/image"
"github.com/hyperhq/hypercli/pkg/archive"

View File

@@ -10,8 +10,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/term"

View File

@@ -6,7 +6,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/stdcopy"

View File

@@ -8,9 +8,9 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -1,8 +1,8 @@
package client
import (
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hypercli/api/client/formatter"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"

View File

@@ -6,7 +6,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -3,7 +3,7 @@ package client
import (
"io"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/pkg/jsonmessage"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -6,7 +6,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
)

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
)

View File

@@ -8,8 +8,8 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/docker/libnetwork/resolvconf/dns"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/opts"

View File

@@ -9,8 +9,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/hyperhq/hyper-api/types"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/stringutils"

View File

@@ -7,9 +7,9 @@ import (
"strings"
"text/tabwriter"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/strslice"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/strslice"
Cli "github.com/hyperhq/hypercli/cli"
ropts "github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -6,8 +6,8 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/net/context"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/hyperhq/hypercli/pkg/promise"

View File

@@ -7,8 +7,8 @@ import (
"sync"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/events"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/cli/command"
"github.com/hyperhq/hypercli/cli/command/formatter"

View File

@@ -8,8 +8,8 @@ import (
"sync"
"time"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hypercli/cli/command/formatter"
"golang.org/x/net/context"
)

View File

@@ -3,7 +3,7 @@ package client
import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
flag "github.com/hyperhq/hypercli/pkg/mflag"
)

View File

@@ -21,8 +21,6 @@ import (
"github.com/docker/distribution/digest"
"github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/transport"
"github.com/docker/engine-api/types"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/notary/client"
"github.com/docker/notary/passphrase"
@@ -30,6 +28,8 @@ import (
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/tuf/signed"
"github.com/docker/notary/tuf/store"
"github.com/hyperhq/hyper-api/types"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hypercli/cliconfig"
"github.com/hyperhq/hypercli/distribution"
"github.com/hyperhq/hypercli/dockerversion"

View File

@@ -4,8 +4,8 @@ import (
"os"
"testing"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hypercli/registry"
registrytypes "github.com/docker/engine-api/types/registry"
)
func unsetENV() {

View File

@@ -14,10 +14,10 @@ import (
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/dutchcoders/goftp"
"github.com/hyperhq/hyper-api/client"
"github.com/hyperhq/hyper-api/types"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hypercli/pkg/signal"
"github.com/hyperhq/hypercli/pkg/term"
"github.com/hyperhq/hypercli/registry"

View File

@@ -7,7 +7,7 @@ import (
"golang.org/x/net/context"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
Cli "github.com/hyperhq/hypercli/cli"
"github.com/hyperhq/hypercli/dockerversion"
flag "github.com/hyperhq/hypercli/pkg/mflag"

View File

@@ -16,8 +16,8 @@ import (
flag "github.com/hyperhq/hypercli/pkg/mflag"
"github.com/cheggaaa/pb"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"golang.org/x/net/context"
)

View File

@@ -9,10 +9,10 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libtrust"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/system"
"github.com/hyperhq/hypercli/pkg/version"
"github.com/docker/engine-api/types"
"github.com/docker/libtrust"
)
// Common constants for daemon and client.

View File

@@ -7,7 +7,7 @@ import (
"os"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
)
type ports struct {

View File

@@ -1,8 +1,8 @@
package build
import (
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/builder"
"github.com/docker/engine-api/types"
"io"
)

View File

@@ -12,15 +12,15 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/go-units"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/builder"
"github.com/hyperhq/hypercli/pkg/ioutils"
"github.com/hyperhq/hypercli/pkg/progress"
"github.com/hyperhq/hypercli/pkg/streamformatter"
"github.com/hyperhq/hypercli/utils"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/docker/go-units"
"golang.org/x/net/context"
)

View File

@@ -4,12 +4,12 @@ import (
"io"
"time"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/daemon"
"github.com/hyperhq/hypercli/daemon/exec"
"github.com/hyperhq/hypercli/pkg/archive"
"github.com/hyperhq/hypercli/pkg/version"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
)
// execBackend includes functions to implement to provide exec functionality.

View File

@@ -12,9 +12,9 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/distribution/registry/api/errcode"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
timetypes "github.com/docker/engine-api/types/time"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
timetypes "github.com/hyperhq/hyper-api/types/time"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/daemon"
derr "github.com/hyperhq/hypercli/errors"

View File

@@ -9,8 +9,8 @@ import (
"os"
"strings"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/docker/engine-api/types"
"golang.org/x/net/context"
)

View File

@@ -8,10 +8,10 @@ import (
"strconv"
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/pkg/stdcopy"
"github.com/hyperhq/hypercli/utils"
"github.com/docker/engine-api/types"
"golang.org/x/net/context"
)

View File

@@ -12,6 +12,8 @@ import (
"github.com/docker/distribution/digest"
"github.com/docker/distribution/registry/api/errcode"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/builder/dockerfile"
derr "github.com/hyperhq/hypercli/errors"
@@ -19,8 +21,6 @@ import (
"github.com/hyperhq/hypercli/pkg/streamformatter"
"github.com/hyperhq/hypercli/reference"
"github.com/hyperhq/hypercli/runconfig"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"golang.org/x/net/context"
)

View File

@@ -1,8 +1,8 @@
package network
import (
"github.com/docker/engine-api/types/network"
"github.com/docker/libnetwork"
"github.com/hyperhq/hyper-api/types/network"
)
// Backend is all the methods that need to be implemented to provide

View File

@@ -5,9 +5,9 @@ import (
"regexp"
"strings"
"github.com/hyperhq/hypercli/runconfig"
"github.com/docker/engine-api/types/filters"
"github.com/docker/libnetwork"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hypercli/runconfig"
)
type filterHandler func([]libnetwork.Network, string) ([]libnetwork.Network, error)

View File

@@ -7,13 +7,13 @@ import (
"golang.org/x/net/context"
"github.com/docker/libnetwork"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/daemon"
"github.com/hyperhq/hypercli/runconfig"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/docker/libnetwork"
)
func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

View File

@@ -1,9 +1,9 @@
package system
import (
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/docker/engine-api/types/filters"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hyper-api/types/filters"
)
// Backend is the methods that need to be implemented to provide

View File

@@ -6,13 +6,13 @@ import (
"time"
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hyper-api/types/filters"
timetypes "github.com/hyperhq/hyper-api/types/time"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/pkg/ioutils"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/docker/engine-api/types/filters"
timetypes "github.com/docker/engine-api/types/time"
"golang.org/x/net/context"
)

View File

@@ -2,7 +2,7 @@ package volume
import (
// TODO return types need to be refactored into pkg
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
)
// Backend is the methods that need to be implemented to provide

View File

@@ -4,8 +4,8 @@ import (
"encoding/json"
"net/http"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/docker/engine-api/types"
"golang.org/x/net/context"
)

View File

@@ -7,6 +7,8 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/go-connections/sockets"
"github.com/gorilla/mux"
"github.com/hyperhq/hypercli/api/server/httputils"
"github.com/hyperhq/hypercli/api/server/router"
"github.com/hyperhq/hypercli/api/server/router/build"
@@ -19,8 +21,6 @@ import (
"github.com/hyperhq/hypercli/daemon"
"github.com/hyperhq/hypercli/pkg/authorization"
"github.com/hyperhq/hypercli/utils"
"github.com/docker/go-connections/sockets"
"github.com/gorilla/mux"
"golang.org/x/net/context"
)

View File

@@ -10,8 +10,8 @@ import (
"time"
"github.com/docker/docker/reference"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
)
// Context represents a file system tree.

View File

@@ -15,8 +15,8 @@ import (
"github.com/docker/docker/builder/dockerfile/parser"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/reference"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
)
var validCommitCommands = map[string]bool{

View File

@@ -23,9 +23,9 @@ import (
"github.com/docker/docker/pkg/signal"
"github.com/docker/docker/pkg/system"
runconfigopts "github.com/docker/docker/runconfig/opts"
"github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/strslice"
"github.com/docker/go-connections/nat"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/strslice"
)
// dispatch with no layer / parsing. This is effectively not a command.

View File

@@ -33,9 +33,9 @@ import (
"github.com/docker/docker/pkg/tarsum"
"github.com/docker/docker/pkg/urlutil"
"github.com/docker/docker/runconfig/opts"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/strslice"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/strslice"
)
func (b *Builder) commit(id string, autoCmd *strslice.StrSlice, comment string) error {

View File

@@ -3,7 +3,7 @@ package command
import (
"sync"
eventtypes "github.com/docker/engine-api/types/events"
eventtypes "github.com/hyperhq/hyper-api/types/events"
)
type eventProcessor func(eventtypes.Message, error) error

View File

@@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/homedir"
)

View File

@@ -7,8 +7,8 @@ import (
"strings"
"testing"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/pkg/homedir"
"github.com/docker/engine-api/types"
)
func TestEmptyConfigDir(t *testing.T) {

View File

@@ -5,7 +5,7 @@ import (
"path/filepath"
"github.com/docker/docker/pkg/archive"
"github.com/docker/engine-api/types"
"github.com/hyperhq/hyper-api/types"
)
// ResolvePath resolves the given path in the container to a resource on the

View File

@@ -24,8 +24,8 @@ import (
"github.com/docker/docker/pkg/symlink"
"github.com/docker/docker/runconfig"
"github.com/docker/docker/volume"
containertypes "github.com/docker/engine-api/types/container"
"github.com/docker/go-connections/nat"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/opencontainers/runc/libcontainer/label"
)

View File

@@ -4,7 +4,7 @@ import (
"testing"
"github.com/docker/docker/pkg/signal"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types/container"
)
func TestContainerStopSignal(t *testing.T) {

View File

@@ -21,13 +21,13 @@ import (
runconfigopts "github.com/docker/docker/runconfig/opts"
"github.com/docker/docker/utils"
"github.com/docker/docker/volume"
containertypes "github.com/docker/engine-api/types/container"
"github.com/docker/engine-api/types/network"
"github.com/docker/go-connections/nat"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hyper-api/types/network"
"github.com/opencontainers/runc/libcontainer/label"
)

View File

@@ -5,7 +5,7 @@ package container
import (
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/volume"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types/container"
)
// Container holds fields specific to the Windows implementation. See

View File

@@ -14,7 +14,7 @@ import (
"github.com/docker/docker/pkg/promise"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/utils"
"github.com/docker/engine-api/types/container"
"github.com/hyperhq/hyper-api/types/container"
)
const (

View File

@@ -7,13 +7,13 @@ import (
"path/filepath"
"strings"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/builder"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/pkg/archive"
"github.com/hyperhq/hypercli/pkg/chrootarchive"
"github.com/hyperhq/hypercli/pkg/idtools"
"github.com/hyperhq/hypercli/pkg/ioutils"
"github.com/docker/engine-api/types"
)
// ErrExtractPointNotDirectory is used to convey that the operation to extract

View File

@@ -7,6 +7,9 @@ import (
"strings"
"time"
"github.com/docker/go-connections/nat"
"github.com/hyperhq/hyper-api/types"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/dockerversion"
"github.com/hyperhq/hypercli/image"
@@ -14,9 +17,6 @@ import (
"github.com/hyperhq/hypercli/pkg/archive"
"github.com/hyperhq/hypercli/pkg/ioutils"
"github.com/hyperhq/hypercli/reference"
"github.com/docker/engine-api/types"
containertypes "github.com/docker/engine-api/types/container"
"github.com/docker/go-connections/nat"
)
// merge merges two Config, the image container configuration (defaults values),

View File

@@ -5,10 +5,10 @@ package daemon
import (
"net"
"github.com/docker/go-units"
"github.com/hyperhq/hypercli/opts"
flag "github.com/hyperhq/hypercli/pkg/mflag"
runconfigopts "github.com/hyperhq/hypercli/runconfig/opts"
"github.com/docker/go-units"
)
var (

View File

@@ -13,6 +13,12 @@ import (
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/go-units"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
containertypes "github.com/hyperhq/hyper-api/types/container"
networktypes "github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/daemon/execdriver"
"github.com/hyperhq/hypercli/daemon/links"
@@ -23,12 +29,6 @@ import (
"github.com/hyperhq/hypercli/pkg/mount"
"github.com/hyperhq/hypercli/pkg/stringid"
"github.com/hyperhq/hypercli/runconfig"
containertypes "github.com/docker/engine-api/types/container"
networktypes "github.com/docker/engine-api/types/network"
"github.com/docker/go-units"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/devices"
"github.com/opencontainers/runc/libcontainer/label"

View File

@@ -5,13 +5,13 @@ package daemon
import (
"strings"
"github.com/docker/libnetwork"
networktypes "github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/daemon/execdriver"
"github.com/hyperhq/hypercli/daemon/execdriver/windows"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/layer"
networktypes "github.com/docker/engine-api/types/network"
"github.com/docker/libnetwork"
)
func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {

View File

@@ -2,6 +2,9 @@ package daemon
import (
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
containertypes "github.com/hyperhq/hyper-api/types/container"
networktypes "github.com/hyperhq/hyper-api/types/network"
"github.com/hyperhq/hypercli/container"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/image"
@@ -9,9 +12,6 @@ import (
"github.com/hyperhq/hypercli/pkg/idtools"
"github.com/hyperhq/hypercli/pkg/stringid"
volumestore "github.com/hyperhq/hypercli/volume/store"
"github.com/docker/engine-api/types"
containertypes "github.com/docker/engine-api/types/container"
networktypes "github.com/docker/engine-api/types/network"
"github.com/opencontainers/runc/libcontainer/label"
)

View File

@@ -7,10 +7,10 @@ import (
"path/filepath"
"github.com/Sirupsen/logrus"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/pkg/stringid"
containertypes "github.com/docker/engine-api/types/container"
"github.com/opencontainers/runc/libcontainer/label"
)

View File

@@ -3,10 +3,10 @@ package daemon
import (
"fmt"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/pkg/stringid"
"github.com/hyperhq/hypercli/volume"
containertypes "github.com/docker/engine-api/types/container"
)
// createContainerPlatformSpecificSettings performs platform specific container create functionality

View File

@@ -21,6 +21,13 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/distribution/digest"
"github.com/hyperhq/hyper-api/types"
containertypes "github.com/hyperhq/hyper-api/types/container"
eventtypes "github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hyper-api/types/filters"
networktypes "github.com/hyperhq/hyper-api/types/network"
registrytypes "github.com/hyperhq/hyper-api/types/registry"
"github.com/hyperhq/hyper-api/types/strslice"
"github.com/hyperhq/hypercli/api"
"github.com/hyperhq/hypercli/builder"
"github.com/hyperhq/hypercli/container"
@@ -28,14 +35,11 @@ import (
"github.com/hyperhq/hypercli/daemon/exec"
"github.com/hyperhq/hypercli/daemon/execdriver"
"github.com/hyperhq/hypercli/daemon/execdriver/execdrivers"
"github.com/docker/engine-api/types"
containertypes "github.com/docker/engine-api/types/container"
eventtypes "github.com/docker/engine-api/types/events"
"github.com/docker/engine-api/types/filters"
networktypes "github.com/docker/engine-api/types/network"
registrytypes "github.com/docker/engine-api/types/registry"
"github.com/docker/engine-api/types/strslice"
// register graph drivers
"github.com/docker/go-connections/nat"
"github.com/docker/libnetwork"
lntypes "github.com/docker/libnetwork/types"
"github.com/docker/libtrust"
_ "github.com/hyperhq/hypercli/daemon/graphdriver/register"
"github.com/hyperhq/hypercli/daemon/logger"
"github.com/hyperhq/hypercli/daemon/network"
@@ -69,10 +73,6 @@ import (
volumedrivers "github.com/hyperhq/hypercli/volume/drivers"
"github.com/hyperhq/hypercli/volume/local"
"github.com/hyperhq/hypercli/volume/store"
"github.com/docker/go-connections/nat"
"github.com/docker/libnetwork"
lntypes "github.com/docker/libnetwork/types"
"github.com/docker/libtrust"
"github.com/opencontainers/runc/libcontainer"
"golang.org/x/net/context"
)

View File

@@ -2,7 +2,7 @@
package daemon
import "github.com/docker/engine-api/types/container"
import "github.com/hyperhq/hyper-api/types/container"
func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) {
return nil, nil

View File

@@ -2,7 +2,7 @@
package daemon
import "github.com/docker/engine-api/types/container"
import "github.com/hyperhq/hyper-api/types/container"
func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) {
return nil, nil

View File

@@ -8,6 +8,8 @@ import (
"testing"
"time"
"github.com/docker/go-connections/nat"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/pkg/discovery"
_ "github.com/hyperhq/hypercli/pkg/discovery/memory"
@@ -17,8 +19,6 @@ import (
volumedrivers "github.com/hyperhq/hypercli/volume/drivers"
"github.com/hyperhq/hypercli/volume/local"
"github.com/hyperhq/hypercli/volume/store"
containertypes "github.com/docker/engine-api/types/container"
"github.com/docker/go-connections/nat"
)
//

View File

@@ -15,6 +15,15 @@ import (
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork"
nwconfig "github.com/docker/libnetwork/config"
"github.com/docker/libnetwork/drivers/bridge"
"github.com/docker/libnetwork/ipamutils"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
pblkiodev "github.com/hyperhq/hyper-api/types/blkiodev"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/image"
@@ -26,15 +35,6 @@ import (
"github.com/hyperhq/hypercli/reference"
"github.com/hyperhq/hypercli/runconfig"
runconfigopts "github.com/hyperhq/hypercli/runconfig/opts"
pblkiodev "github.com/docker/engine-api/types/blkiodev"
containertypes "github.com/docker/engine-api/types/container"
"github.com/docker/libnetwork"
nwconfig "github.com/docker/libnetwork/config"
"github.com/docker/libnetwork/drivers/bridge"
"github.com/docker/libnetwork/ipamutils"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
blkiodev "github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/label"
"github.com/opencontainers/runc/libcontainer/user"

View File

@@ -7,8 +7,8 @@ import (
"os"
"testing"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
containertypes "github.com/docker/engine-api/types/container"
)
// Unix test as uses settings which are not available on Windows

View File

@@ -10,18 +10,18 @@ import (
"strings"
"github.com/Sirupsen/logrus"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/daemon/graphdriver"
"github.com/hyperhq/hypercli/dockerversion"
"github.com/hyperhq/hypercli/image"
"github.com/hyperhq/hypercli/layer"
"github.com/hyperhq/hypercli/reference"
containertypes "github.com/docker/engine-api/types/container"
// register the windows graph driver
"github.com/docker/libnetwork"
"github.com/hyperhq/hypercli/daemon/graphdriver/windows"
"github.com/hyperhq/hypercli/pkg/idtools"
"github.com/hyperhq/hypercli/pkg/system"
"github.com/docker/libnetwork"
blkiodev "github.com/opencontainers/runc/libcontainer/configs"
)

View File

@@ -7,11 +7,11 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/container"
derr "github.com/hyperhq/hypercli/errors"
"github.com/hyperhq/hypercli/layer"
volumestore "github.com/hyperhq/hypercli/volume/store"
"github.com/docker/engine-api/types"
)
// ContainerRm removes the container id from the filesystem. An error

View File

@@ -5,9 +5,9 @@ import (
"os"
"testing"
"github.com/hyperhq/hyper-api/types"
containertypes "github.com/hyperhq/hyper-api/types/container"
"github.com/hyperhq/hypercli/container"
"github.com/docker/engine-api/types"
containertypes "github.com/docker/engine-api/types/container"
)
func TestContainerDoubleDelete(t *testing.T) {

View File

@@ -3,9 +3,9 @@ package daemon
import (
"strings"
"github.com/hyperhq/hypercli/container"
"github.com/docker/engine-api/types/events"
"github.com/docker/libnetwork"
"github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hypercli/container"
)
// LogContainerEvent generates an event related to a container with only the default attributes.

View File

@@ -4,8 +4,8 @@ import (
"sync"
"time"
eventtypes "github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hypercli/pkg/pubsub"
eventtypes "github.com/docker/engine-api/types/events"
)
const (

View File

@@ -5,7 +5,7 @@ import (
"testing"
"time"
"github.com/docker/engine-api/types/events"
"github.com/hyperhq/hyper-api/types/events"
)
func TestEventsLog(t *testing.T) {

View File

@@ -1,9 +1,9 @@
package events
import (
"github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hyper-api/types/filters"
"github.com/hyperhq/hypercli/reference"
"github.com/docker/engine-api/types/events"
"github.com/docker/engine-api/types/filters"
)
// Filter can filter out docker events from a stream

View File

@@ -4,10 +4,10 @@ import (
"testing"
"time"
containertypes "github.com/hyperhq/hyper-api/types/container"
eventtypes "github.com/hyperhq/hyper-api/types/events"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/daemon/events"
containertypes "github.com/docker/engine-api/types/container"
eventtypes "github.com/docker/engine-api/types/events"
)
func TestLogContainerEventCopyLabels(t *testing.T) {

View File

@@ -6,6 +6,8 @@ import (
"time"
"github.com/Sirupsen/logrus"
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hyper-api/types/strslice"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/daemon/exec"
"github.com/hyperhq/hypercli/daemon/execdriver"
@@ -13,8 +15,6 @@ import (
"github.com/hyperhq/hypercli/pkg/pools"
"github.com/hyperhq/hypercli/pkg/promise"
"github.com/hyperhq/hypercli/pkg/term"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/strslice"
)
func (d *Daemon) registerExecCommand(container *container.Container, config *exec.Config) {

View File

@@ -3,9 +3,9 @@
package daemon
import (
"github.com/hyperhq/hyper-api/types"
"github.com/hyperhq/hypercli/container"
"github.com/hyperhq/hypercli/daemon/execdriver"
"github.com/docker/engine-api/types"
)
// setPlatformSpecificExecProcessConfig sets platform-specific fields in the

Some files were not shown because too many files have changed in this diff Show More