Explorar o código

default context type is “moby”

Guillaume Tardif %!s(int64=5) %!d(string=hai) anos
pai
achega
84cdf58e8a

+ 2 - 1
context/store/store.go

@@ -96,7 +96,8 @@ const (
 	// AciContextType is the endpoint key in the context endpoints for an ACI
 	// backend
 	AciContextType = "aci"
-	// LocalContextType is the endpoint key in the context endpoints for a new local backend
+	// LocalContextType is the endpoint key in the context endpoints for a new
+	// local backend
 	LocalContextType = "local"
 	// ExampleContextType is the endpoint key in the context endpoints for an
 	// example backend

+ 1 - 1
context/store/storedefault.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-const defaultContextType = "docker"
+const defaultContextType = "moby"
 
 // Represents a context as created by the docker cli
 type defaultContext struct {

+ 1 - 1
tests/e2e/testdata/ls-out-default-windows.golden

@@ -1,2 +1,2 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT                  KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+default *           moby                Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm

+ 1 - 1
tests/e2e/testdata/ls-out-default.golden

@@ -1,2 +1,2 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
+default *           moby                Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm

+ 2 - 2
tests/e2e/testdata/ls-out-test-docker-windows.golden

@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT                  KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
-test-docker         docker                                                        npipe:////./pipe/docker_engine                         swarm
+default *           moby                Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+test-docker         moby                                                          npipe:////./pipe/docker_engine                         swarm

+ 2 - 2
tests/e2e/testdata/ls-out-test-docker.golden

@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT   ORCHESTRATOR
-default *           docker              Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
-test-docker         docker                                                        unix:///var/run/docker.sock                         swarm
+default *           moby                Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
+test-docker         moby                                                          unix:///var/run/docker.sock                         swarm

+ 1 - 1
tests/e2e/testdata/ls-out-test-example-windows.golden

@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT                  KUBERNETES ENDPOINT   ORCHESTRATOR
-default             docker              Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
+default             moby                Current DOCKER_HOST based configuration   npipe:////./pipe/docker_engine                         swarm
 test-example *      example                                                                                                              

+ 1 - 1
tests/e2e/testdata/ls-out-test-example.golden

@@ -1,3 +1,3 @@
 NAME                TYPE                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT   ORCHESTRATOR
-default             docker              Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
+default             moby                Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                         swarm
 test-example *      example