starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 07:25:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29775 from AkihiroSuda/integration-cli-on-swarm

Browse Source 
[EXPERIMENTAL] Integration Test on Swarm (completes in about 5 minutes, with 10 Swarm nodes)
Upstream-commit: 01ed606439976e8a159c2a8406228ac52941ae47
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-03-01 21:16:05 +01:00
committed by GitHub
parent 13f20b59db e642076136
commit 324d1b77a6
24 changed files with 1486 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/daemon/daemon.go
+6 -3
View File
@@ -77,12 +77,15 @@ type clientConfig struct {
}
// New returns a Daemon instance to be used for testing.
// This will create a directory such as d123456789 in the folder specified by $DEST.
// This will create a directory such as d123456789 in the folder specified by $DOCKER_INTEGRATION_DAEMON_DEST or $DEST.
// The daemon will not automatically start.
func New(t testingT, dockerBinary string, dockerdBinary string, config Config) *Daemon {
dest := os.Getenv("DEST")
dest := os.Getenv("DOCKER_INTEGRATION_DAEMON_DEST")
if dest == "" {
t.Fatalf("Please set the DEST environment variable")
dest = os.Getenv("DEST")
}
if dest == "" {
t.Fatalf("Please set the DOCKER_INTEGRATION_DAEMON_DEST or the DEST environment variable")
}
if err := os.MkdirAll(SockRoot, 0700); err != nil {