From e96b33665e58f73a16923b89a9bcc6fe6fcdb6c6 Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Thu, 28 Dec 2017 20:18:06 -0500 Subject: [PATCH] Fixed in-container paths in dev doc: moby/moby -> docker/docker. Further to 355cf9483c1b8ede5ae3ed50add4de2a69d62645 which caught some of these. This should fix the remainder in the contributing docs. Signed-off-by: Brett Randall --- docs/contributing/set-up-dev-env.md | 2 +- docs/contributing/software-req-win.md | 2 +- docs/contributing/test.md | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/contributing/set-up-dev-env.md b/docs/contributing/set-up-dev-env.md index b4cacf529e..7f8a38119f 100644 --- a/docs/contributing/set-up-dev-env.md +++ b/docs/contributing/set-up-dev-env.md @@ -130,7 +130,7 @@ can take over 15 minutes to complete. ```none Successfully built 3d872560918e Successfully tagged docker-dev:dry-run-test - docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_INCREMENTAL_BINARY -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/moby/moby/bundles" -t "docker-dev:dry-run-test" bash + docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_INCREMENTAL_BINARY -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/docker/docker/bundles" -t "docker-dev:dry-run-test" bash root@f31fa223770f:/go/src/github.com/docker/docker# ``` diff --git a/docs/contributing/software-req-win.md b/docs/contributing/software-req-win.md index 3be4327933..d51861cbe5 100644 --- a/docs/contributing/software-req-win.md +++ b/docs/contributing/software-req-win.md @@ -109,7 +109,7 @@ To test it, stop the system Docker daemon and start the one you just built: .\dockerd.exe -D The other make targets work too, to run unit tests try: -`docker run --rm docker-builder sh -c 'cd /c/go/src/github.com/moby/moby; hack/make.sh test-unit'`. +`docker run --rm docker-builder sh -c 'cd /c/go/src/github.com/docker/docker; hack/make.sh test-unit'`. ### 6. Remove the interim binaries container diff --git a/docs/contributing/test.md b/docs/contributing/test.md index 6a4c984a39..7e9107d116 100644 --- a/docs/contributing/test.md +++ b/docs/contributing/test.md @@ -107,13 +107,13 @@ Try this now. `dry-run-test` image. ```bash - $ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/moby/moby dry-run-test /bin/bash + $ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/docker/docker dry-run-test /bin/bash ``` 3. Run the tests using the `hack/make.sh` script. ```bash - root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py + root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py ``` The tests run just as they did within your local host. @@ -122,7 +122,7 @@ Try this now. just the unit tests: ```bash - root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit + root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit ``` Most test targets require that you build these precursor targets first: @@ -170,7 +170,7 @@ $ TESTFLAGS='-check.f DockerSuite.TestBuild*' make test-integration To run the same test inside your Docker development container, you do this: ```bash -root@5f8630b873fe:/go/src/github.com/moby/moby# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration +root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration ``` ## Test the Windows binary against a Linux daemon @@ -188,7 +188,7 @@ run a Bash terminal on Windows. 2. Change to the `moby` source directory. ```bash - $ cd /c/gopath/src/github.com/moby/moby + $ cd /c/gopath/src/github.com/docker/docker ``` 3. Set `DOCKER_REMOTE_DAEMON` as follows: