From 1d51022fe81c77d3b394b80996310fa5e6812c1e Mon Sep 17 00:00:00 2001 From: Brett Randall Date: Wed, 14 Feb 2018 22:03:52 +1100 Subject: [PATCH] Updated docker-on-docker build-notes. These are now more in-line with wiki instructions. Also removes broken/deprecated make target test-unit. Signed-off-by: Brett Randall Upstream-commit: ba49e8c49830b69c833edff3c393716da20f897a Component: engine --- components/engine/Dockerfile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 560adc79a2..6b137c3990 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -2,14 +2,23 @@ # # Usage: # -# # Assemble the full dev environment. This is slow the first time. -# docker build -t docker . +# # Use make to build a development environment image and run it in a container. +# # This is slow the first time. +# make BIND_DIR=. shell # -# # Mount your source in an interactive container for quick testing: -# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash +# The following commands are executed inside the running container. + +# # Make a dockerd binary. +# # hack/make.sh binary # -# # Run the test suite: -# docker run -e DOCKER_GITCOMMIT=foo --privileged docker hack/make.sh test-unit test-integration test-docker-py +# # Install dockerd to /usr/local/bin +# # make install +# +# # Run unit tests +# # hack/test/unit +# +# # Run tests e.g. integration, py +# # hack/make.sh binary test-integration test-docker-py # # # Publish a release: # docker run --privileged \