From bef0cd70a62eff156d99ddd15933b658a1af8893 Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Tue, 20 Feb 2018 11:28:54 +1100 Subject: [PATCH] Removed root@... PS1 from in-container root prompts, retaining #. Signed-off-by: Brett Randall --- docs/contributing/set-up-dev-env.md | 14 +++++++------- docs/contributing/test.md | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/contributing/set-up-dev-env.md b/docs/contributing/set-up-dev-env.md index 7f8a38119f..311edf8951 100644 --- a/docs/contributing/set-up-dev-env.md +++ b/docs/contributing/set-up-dev-env.md @@ -131,7 +131,7 @@ can take over 15 minutes to complete. 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/docker/docker/bundles" -t "docker-dev:dry-run-test" bash - root@f31fa223770f:/go/src/github.com/docker/docker# + # ``` At this point, your prompt reflects the container's BASH shell. @@ -146,7 +146,7 @@ can take over 15 minutes to complete. 6. Make a `dockerd` binary. ```none - root@a8b2885ab900:/go/src/github.com/docker/docker# hack/make.sh binary + # hack/make.sh binary Removing bundles/ ---> Making bundle: binary (in bundles/binary) @@ -160,13 +160,13 @@ can take over 15 minutes to complete. `/usr/local/bin/` directory. ```none - root@a8b2885ab900:/go/src/github.com/docker/docker# make install + # make install ``` 8. Start the Engine daemon running in the background. ```none - root@a8b2885ab900:/go/src/github.com/docker/docker# dockerd -D & + # dockerd -D & ...output snipped... DEBU[0001] Registering POST, /networks/{id:.*}/connect DEBU[0001] Registering POST, /networks/{id:.*}/disconnect @@ -252,13 +252,13 @@ can take over 15 minutes to complete. 10. Run the `hello-world` image. ```none - root@5f8630b873fe:/go/src/github.com/docker/docker# docker run hello-world + # docker run hello-world ``` 11. List the image you just downloaded. ```none - root@5f8630b873fe:/go/src/github.com/docker/docker# docker images + # docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello-world latest c54a2cc56cbb 3 months ago 1.85 kB ``` @@ -347,7 +347,7 @@ example, you'll edit the help for the `attach` subcommand. 10. To view your change, run the `dockerd --help` command in the docker development container shell. ```bash - root@b0cb4f22715d:/go/src/github.com/docker/docker# dockerd --help + # dockerd --help Usage: dockerd COMMAND diff --git a/docs/contributing/test.md b/docs/contributing/test.md index 71a8a91387..fdcee328a9 100644 --- a/docs/contributing/test.md +++ b/docs/contributing/test.md @@ -117,13 +117,13 @@ Try this now. 3. Run the unit tests using the `hack/test/unit` script. ```bash - root@5f8630b873fe:/go/src/github.com/docker/docker# hack/test/unit + # hack/test/unit ``` 4. Run the tests using the `hack/make.sh` script. ```bash - root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-integration test-docker-py + # hack/make.sh dynbinary binary cross test-integration test-docker-py ``` The tests run just as they did within your local host. @@ -132,7 +132,7 @@ Try this now. just the integration tests: ```bash - root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-integration + # hack/make.sh dynbinary binary cross test-integration ``` Most test targets require that you build these precursor targets first: @@ -180,7 +180,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/docker/docker# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration +# TESTFLAGS='-check.f TestBuild*' hack/make.sh binary test-integration ``` ## Test the Windows binary against a Linux daemon