epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vendor dependencies and use docker/go-docker for API types

Browse Source
This commit is contained in:
Marcos Lilljedahl
2017-10-20 18:42:16 -03:00
parent 82b95ee112
commit 7ce693fab5
16 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docker/docker.go
View File

@@ -14,13 +14,13 @@ import (
"strings"
"time"
"github.com/docker/distribution/reference"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
client "docker.io/go-docker"
"docker.io/go-docker/api/types"
"docker.io/go-docker/api/types/container"
"docker.io/go-docker/api/types/network"
"docker.io/go-docker/api/types/swarm"
"docker.io/go-docker/api/types/volume"
"github.com/containerd/containerd/reference"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/play-with-docker/play-with-docker/config"
)
@@ -398,7 +398,7 @@ func (d *docker) GetContainerIPs(id string) (map[string]string, error) {
}
func (d *docker) pullImage(ctx context.Context, image string) error {
_, err := reference.ParseNormalizedNamed(image)
_, err := reference.Parse(image)
if err != nil {
return err
}
@@ -431,7 +431,7 @@ func (d *docker) ExecAttach(instanceName string, command []string, out io.Writer
if err != nil {
return 0, err
}
resp, err := d.c.ContainerExecAttach(context.Background(), e.ID, types.ExecStartCheck{Tty: true})
resp, err := d.c.ContainerExecAttach(context.Background(), e.ID, types.ExecConfig{AttachStdout: true, AttachStderr: true, Tty: true})
if err != nil {
return 0, err
}

4
docker/factory.go
View File

@@ -8,8 +8,8 @@ import (
"net/url"
"time"
"github.com/docker/docker/api"
"github.com/docker/docker/client"
"docker.io/go-docker/api"
client "docker.io/go-docker"
"github.com/docker/go-connections/tlsconfig"
"github.com/play-with-docker/play-with-docker/pwd/types"
"github.com/play-with-docker/play-with-docker/router"

2
docker/local_cached_factory.go
View File

@@ -7,7 +7,7 @@ import (
"sync"
"time"
"github.com/docker/docker/client"
client "docker.io/go-docker"
"github.com/play-with-docker/play-with-docker/pwd/types"
"github.com/play-with-docker/play-with-docker/storage"
)

4
docker/mock.go
View File

@@ -5,8 +5,8 @@ import (
"net"
"time"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"docker.io/go-docker/api/types"
client "docker.io/go-docker"
"github.com/stretchr/testify/mock"
)