Further to 355cf9483c1b8ede5ae3ed50add4de2a69d62645 which caught some
of these. This should fix the remainder in the contributing docs.
Signed-off-by: Brett Randall <javabrett@gmail.com>
| ... | ... |
@@ -130,7 +130,7 @@ can take over 15 minutes to complete. |
| 130 | 130 |
```none |
| 131 | 131 |
Successfully built 3d872560918e |
| 132 | 132 |
Successfully tagged docker-dev:dry-run-test |
| 133 |
- 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 |
|
| 133 |
+ 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 |
|
| 134 | 134 |
root@f31fa223770f:/go/src/github.com/docker/docker# |
| 135 | 135 |
``` |
| 136 | 136 |
|
| ... | ... |
@@ -109,7 +109,7 @@ To test it, stop the system Docker daemon and start the one you just built: |
| 109 | 109 |
.\dockerd.exe -D |
| 110 | 110 |
|
| 111 | 111 |
The other make targets work too, to run unit tests try: |
| 112 |
-`docker run --rm docker-builder sh -c 'cd /c/go/src/github.com/moby/moby; hack/make.sh test-unit'`. |
|
| 112 |
+`docker run --rm docker-builder sh -c 'cd /c/go/src/github.com/docker/docker; hack/make.sh test-unit'`. |
|
| 113 | 113 |
|
| 114 | 114 |
### 6. Remove the interim binaries container |
| 115 | 115 |
|
| ... | ... |
@@ -107,13 +107,13 @@ Try this now. |
| 107 | 107 |
`dry-run-test` image. |
| 108 | 108 |
|
| 109 | 109 |
```bash |
| 110 |
- $ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/moby/moby dry-run-test /bin/bash |
|
| 110 |
+ $ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/docker/docker dry-run-test /bin/bash |
|
| 111 | 111 |
``` |
| 112 | 112 |
|
| 113 | 113 |
3. Run the tests using the `hack/make.sh` script. |
| 114 | 114 |
|
| 115 | 115 |
```bash |
| 116 |
- root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py |
|
| 116 |
+ root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py |
|
| 117 | 117 |
``` |
| 118 | 118 |
|
| 119 | 119 |
The tests run just as they did within your local host. |
| ... | ... |
@@ -122,7 +122,7 @@ Try this now. |
| 122 | 122 |
just the unit tests: |
| 123 | 123 |
|
| 124 | 124 |
```bash |
| 125 |
- root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit |
|
| 125 |
+ root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit |
|
| 126 | 126 |
``` |
| 127 | 127 |
|
| 128 | 128 |
Most test targets require that you build these precursor targets first: |
| ... | ... |
@@ -170,7 +170,7 @@ $ TESTFLAGS='-check.f DockerSuite.TestBuild*' make test-integration |
| 170 | 170 |
To run the same test inside your Docker development container, you do this: |
| 171 | 171 |
|
| 172 | 172 |
```bash |
| 173 |
-root@5f8630b873fe:/go/src/github.com/moby/moby# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration |
|
| 173 |
+root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration |
|
| 174 | 174 |
``` |
| 175 | 175 |
|
| 176 | 176 |
## Test the Windows binary against a Linux daemon |
| ... | ... |
@@ -188,7 +188,7 @@ run a Bash terminal on Windows. |
| 188 | 188 |
2. Change to the `moby` source directory. |
| 189 | 189 |
|
| 190 | 190 |
```bash |
| 191 |
- $ cd /c/gopath/src/github.com/moby/moby |
|
| 191 |
+ $ cd /c/gopath/src/github.com/docker/docker |
|
| 192 | 192 |
``` |
| 193 | 193 |
|
| 194 | 194 |
3. Set `DOCKER_REMOTE_DAEMON` as follows: |