kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Removed root@... PS1 from in-container root prompts, retaining #.

Browse source 
Signed-off-by: Brett Randall <javabrett@gmail.com>
This commit is contained in:
Brett Randall 2018-02-20 11:28:54 +11:00
parent acaa53bc35
commit bef0cd70a6
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
docs/contributing/set-up-dev-env.md
View file

@ -131,7 +131,7 @@ can take over 15 minutes to complete.
Successfully built 3d872560918e Successfully built 3d872560918e
Successfully tagged docker-dev:dry-run-test 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 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. 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. 6. Make a `dockerd` binary.
```none ```none
root@a8b2885ab900:/go/src/github.com/docker/docker# hack/make.sh binary # hack/make.sh binary
Removing bundles/ Removing bundles/
---> Making bundle: binary (in bundles/binary) ---> Making bundle: binary (in bundles/binary)
@ -160,13 +160,13 @@ can take over 15 minutes to complete.
`/usr/local/bin/` directory. `/usr/local/bin/` directory.
```none ```none
root@a8b2885ab900:/go/src/github.com/docker/docker# make install # make install
``` ```
8. Start the Engine daemon running in the background. 8. Start the Engine daemon running in the background.
```none ```none
root@a8b2885ab900:/go/src/github.com/docker/docker# dockerd -D & # dockerd -D &
...output snipped... ...output snipped...
DEBU[0001] Registering POST, /networks/{id:.*}/connect DEBU[0001] Registering POST, /networks/{id:.*}/connect
DEBU[0001] Registering POST, /networks/{id:.*}/disconnect DEBU[0001] Registering POST, /networks/{id:.*}/disconnect
@ -252,13 +252,13 @@ can take over 15 minutes to complete.
10. Run the `hello-world` image. 10. Run the `hello-world` image.
```none ```none
root@5f8630b873fe:/go/src/github.com/docker/docker# docker run hello-world # docker run hello-world
``` ```
11. List the image you just downloaded. 11. List the image you just downloaded.
```none ```none
root@5f8630b873fe:/go/src/github.com/docker/docker# docker images # docker images
REPOSITORY TAG IMAGE ID CREATED SIZE REPOSITORY TAG IMAGE ID CREATED SIZE
hello-world latest c54a2cc56cbb 3 months ago 1.85 kB 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. 10. To view your change, run the `dockerd --help` command in the docker development container shell.
```bash ```bash
root@b0cb4f22715d:/go/src/github.com/docker/docker# dockerd --help # dockerd --help
Usage: dockerd COMMAND Usage: dockerd COMMAND

8
docs/contributing/test.md
View file

@ -117,13 +117,13 @@ Try this now.
3. Run the unit tests using the `hack/test/unit` script. 3. Run the unit tests using the `hack/test/unit` script.
```bash ```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. 4. Run the tests using the `hack/make.sh` script.
```bash ```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. The tests run just as they did within your local host.
@ -132,7 +132,7 @@ Try this now.
just the integration tests: just the integration tests:
```bash ```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: 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: To run the same test inside your Docker development container, you do this:
```bash ```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 ## Test the Windows binary against a Linux daemon