docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://www.github.com/docker/docker.github.io

This commit is contained in:
John Mulhausen 2016-10-19 10:22:42 -07:00
parent 8b79352c77 c5fbd4fb6d
commit 2cc28f309f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/installation/linux/ubuntulinux.md
View File

@ -99,7 +99,7 @@ packages from the Docker repository:
$ sudo apt-get update
```
8. Verify that `APT` is pulling from the right repository.
8. Verify that `APT` is pulling from the right repository.
When you run the following command, an entry is returned for each version of
Docker that is available for you to install. Each entry should have the URL

22
opensource/project/set-up-dev-env.md
View File

@ -125,7 +125,7 @@ can take over 15 minutes to complete.
4. Use `make` to build a development environment image and run it in a container.
```none
$ make shell
$ make BIN_DIR=. shell
```
The command returns informational messages as it runs. The first build may
@ -162,11 +162,11 @@ can take over 15 minutes to complete.
Copying nested executables into bundles/1.12.0-dev/binary
```
7. Copy the binary to the container's `/usr/bin` directory.
7. Copy the binary to the container's `**/usr/bin/**` directory.
```none
root@a8b2885ab900:/go/src/github.com/docker/docker# cp bundles/1.12.0-dev/binary-client/docker* /usr/bin
root@a8b2885ab900:/go/src/github.com/docker/docker# cp bundles/1.12.0-dev/binary-daemon/docker* /usr/bin
root@a8b2885ab900:/go/src/github.com/docker/docker# cp bundles/1.12.0-dev/binary-client/docker* /usr/bin/
root@a8b2885ab900:/go/src/github.com/docker/docker# cp bundles/1.12.0-dev/binary-daemon/docker* /usr/bin/
```
8. Start the Engine daemon running in the background.
@ -275,15 +275,19 @@ example, you'll edit the help for the `attach` subcommand.
5. Save and close the `cli/command/container/attach.go` file.
6. Go to your running development container.
6. Go to your running docker development container shell.
7. Remake the binary and copy it to `usr/bin`
7. Rebuild the binary by using the command `hack/make.sh binary` in the docker development container shell.
8. Restart the Docker daemon with the new binary.
8. Copy the binaries to **/usr/bin** by entering the following commands in the docker development container shell.
```
cp bundles/1.12.0-dev/binary-client/docker* /usr/bin/
cp bundles/1.12.0-dev/binary-daemon/docker* /usr/bin/
```
9. View your change by display the `attach` help.
9. To view your change, run the `docker attach --help` command in the docker development container shell.
```none
```bash
root@b0cb4f22715d:/go/src/github.com/docker/docker# docker attach --help
Usage: docker attach [OPTIONS] CONTAINER