From 693e0a968181d4f27bcb110f5b553236f60f6de9 Mon Sep 17 00:00:00 2001 From: Troy Connor Date: Tue, 18 Oct 2016 12:32:47 -0400 Subject: [PATCH] [set-up-dev-env]Added command make BIN_DIR=. shell along with instructions to copy binaries --- opensource/project/set-up-dev-env.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/opensource/project/set-up-dev-env.md b/opensource/project/set-up-dev-env.md index 652469f930..0204511407 100644 --- a/opensource/project/set-up-dev-env.md +++ b/opensource/project/set-up-dev-env.md @@ -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