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

3
.gitignore vendored
View File

@@ -1,4 +1,3 @@
play-with-docker play-with-docker
node_modules node_modules
docker-compose.single.yml vendor
lala

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM golang:1.8 FROM golang:1.9
COPY . /go/src/github.com/play-with-docker/play-with-docker COPY . /go/src/github.com/play-with-docker/play-with-docker

18
docker/docker.go
View File

@@ -14,13 +14,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/distribution/reference" client "docker.io/go-docker"
"github.com/docker/docker/api/types" "docker.io/go-docker/api/types"
"github.com/docker/docker/api/types/container" "docker.io/go-docker/api/types/container"
"github.com/docker/docker/api/types/network" "docker.io/go-docker/api/types/network"
"github.com/docker/docker/api/types/swarm" "docker.io/go-docker/api/types/swarm"
"github.com/docker/docker/api/types/volume" "docker.io/go-docker/api/types/volume"
"github.com/docker/docker/client" "github.com/containerd/containerd/reference"
"github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/jsonmessage"
"github.com/play-with-docker/play-with-docker/config" "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 { func (d *docker) pullImage(ctx context.Context, image string) error {
_, err := reference.ParseNormalizedNamed(image) _, err := reference.Parse(image)
if err != nil { if err != nil {
return err return err
} }
@@ -431,7 +431,7 @@ func (d *docker) ExecAttach(instanceName string, command []string, out io.Writer
if err != nil { if err != nil {
return 0, err 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 { if err != nil {
return 0, err return 0, err
} }

4
docker/factory.go
View File

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

2
docker/local_cached_factory.go
View File

@@ -7,7 +7,7 @@ import (
"sync" "sync"
"time" "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/pwd/types"
"github.com/play-with-docker/play-with-docker/storage" "github.com/play-with-docker/play-with-docker/storage"
) )

4
docker/mock.go
View File

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

2
provisioner/overlay.go
View File

@@ -6,7 +6,7 @@ import (
"net/url" "net/url"
"strings" "strings"
dtypes "github.com/docker/docker/api/types" dtypes "docker.io/go-docker/api/types"
"github.com/play-with-docker/play-with-docker/config" "github.com/play-with-docker/play-with-docker/config"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/pwd/types" "github.com/play-with-docker/play-with-docker/pwd/types"

2
pwd/client_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
dtypes "github.com/docker/docker/api/types" dtypes "docker.io/go-docker/api/types"
"github.com/play-with-docker/play-with-docker/config" "github.com/play-with-docker/play-with-docker/config"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"

2
pwd/instance_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
dtypes "github.com/docker/docker/api/types" dtypes "docker.io/go-docker/api/types"
"github.com/play-with-docker/play-with-docker/config" "github.com/play-with-docker/play-with-docker/config"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"

2
pwd/session_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
dtypes "github.com/docker/docker/api/types" dtypes "docker.io/go-docker/api/types"
"github.com/play-with-docker/play-with-docker/config" "github.com/play-with-docker/play-with-docker/config"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"

8
router/l2/l2.go
View File

@@ -10,10 +10,10 @@ import (
"os" "os"
"time" "time"
"github.com/docker/docker/api/types" "docker.io/go-docker/api/types"
"github.com/docker/docker/api/types/filters" "docker.io/go-docker/api/types/filters"
"github.com/docker/docker/api/types/network" "docker.io/go-docker/api/types/network"
"github.com/docker/docker/client" client "docker.io/go-docker"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/play-with-docker/play-with-docker/config" "github.com/play-with-docker/play-with-docker/config"
"github.com/play-with-docker/play-with-docker/router" "github.com/play-with-docker/play-with-docker/router"

4
scheduler/task/check_swarm_ports_test.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"testing" "testing"
dockerTypes "github.com/docker/docker/api/types" dockerTypes "docker.io/go-docker/api/types"
"github.com/docker/docker/api/types/swarm" "docker.io/go-docker/api/types/swarm"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"
"github.com/play-with-docker/play-with-docker/pwd/types" "github.com/play-with-docker/play-with-docker/pwd/types"

2
scheduler/task/check_swarm_status.go
View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"log" "log"
"github.com/docker/docker/api/types/swarm" "docker.io/go-docker/api/types/swarm"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"
"github.com/play-with-docker/play-with-docker/pwd/types" "github.com/play-with-docker/play-with-docker/pwd/types"

4
scheduler/task/check_swarm_status_test.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"testing" "testing"
dockerTypes "github.com/docker/docker/api/types" dockerTypes "docker.io/go-docker/api/types"
"github.com/docker/docker/api/types/swarm" "docker.io/go-docker/api/types/swarm"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"
"github.com/play-with-docker/play-with-docker/pwd/types" "github.com/play-with-docker/play-with-docker/pwd/types"

2
scheduler/task/collect_stats.go
View File

@@ -10,7 +10,7 @@ import (
"net/url" "net/url"
"time" "time"
dockerTypes "github.com/docker/docker/api/types" dockerTypes "docker.io/go-docker/api/types"
units "github.com/docker/go-units" units "github.com/docker/go-units"
lru "github.com/hashicorp/golang-lru" lru "github.com/hashicorp/golang-lru"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"

2
scheduler/task/collect_stats_test.go
View File

@@ -7,7 +7,7 @@ import (
"io" "io"
"testing" "testing"
dockerTypes "github.com/docker/docker/api/types" dockerTypes "docker.io/go-docker/api/types"
"github.com/play-with-docker/play-with-docker/docker" "github.com/play-with-docker/play-with-docker/docker"
"github.com/play-with-docker/play-with-docker/event" "github.com/play-with-docker/play-with-docker/event"
"github.com/play-with-docker/play-with-docker/pwd/types" "github.com/play-with-docker/play-with-docker/pwd/types"