Преглед изворни кода

Merge pull request #33202 from AkihiroSuda/fix-it-on-swarm

integration-cli-on-swarm/README.md: add a note about Docker->Moby
Sebastiaan van Stijn пре 8 година
родитељ
комит
b5f4fc7162
2 измењених фајлова са 3 додато и 1 уклоњено
  1. 1 1
      Makefile
  2. 2 0
      hack/integration-cli-on-swarm/README.md

+ 1 - 1
Makefile

@@ -190,7 +190,7 @@ swagger-docs: ## preview the API documentation
 		bfirsh/redoc:1.6.2
 		bfirsh/redoc:1.6.2
 
 
 build-integration-cli-on-swarm: build ## build images and binary for running integration-cli on Swarm in parallel
 build-integration-cli-on-swarm: build ## build images and binary for running integration-cli on Swarm in parallel
-	@echo "Building hack/integration-cli-on-swarm"
+	@echo "Building hack/integration-cli-on-swarm (if build fails, please refer to hack/integration-cli-on-swarm/README.md)"
 	go build -o ./hack/integration-cli-on-swarm/integration-cli-on-swarm ./hack/integration-cli-on-swarm/host
 	go build -o ./hack/integration-cli-on-swarm/integration-cli-on-swarm ./hack/integration-cli-on-swarm/host
 	@echo "Building $(INTEGRATION_CLI_MASTER_IMAGE)"
 	@echo "Building $(INTEGRATION_CLI_MASTER_IMAGE)"
 	docker build -t $(INTEGRATION_CLI_MASTER_IMAGE) hack/integration-cli-on-swarm/agent
 	docker build -t $(INTEGRATION_CLI_MASTER_IMAGE) hack/integration-cli-on-swarm/agent

+ 2 - 0
hack/integration-cli-on-swarm/README.md

@@ -38,6 +38,8 @@ Following environment variables are known to work in this step:
  - `BUILDFLAGS`
  - `BUILDFLAGS`
  - `DOCKER_INCREMENTAL_BINARY`
  - `DOCKER_INCREMENTAL_BINARY`
 
 
+Note: during the transition into Moby Project, you might need to create a symbolic link `$GOPATH/src/github.com/docker/docker` to `$GOPATH/src/github.com/moby/moby`. 
+
 ### Step 2: Execute tests
 ### Step 2: Execute tests
 
 
     $ ./hack/integration-cli-on-swarm/integration-cli-on-swarm -replicas 40 -push-worker-image YOUR_REGISTRY.EXAMPLE.COM/integration-cli-worker:latest 
     $ ./hack/integration-cli-on-swarm/integration-cli-on-swarm -replicas 40 -push-worker-image YOUR_REGISTRY.EXAMPLE.COM/integration-cli-worker:latest