From 5d92296f82fd9cee936e86e881f3c63deed77d11 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sat, 30 Nov 2013 00:07:53 -0800 Subject: [PATCH] Minor fixes based on discussions on #2693 * Volume exports ./bundles instead of root directory * Documents build using docker-docs instead of docker:docs * Bundles directory is created before running build or docs Upstream-commit: 56ab9cb0d5169401616acc7a396e9f4af00ed670 Component: engine --- components/engine/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index 1447a4ed12..dd992946a4 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -1,14 +1,18 @@ default: build -build: +build: bundles docker build -t docker . - docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary + docker run -privileged -v `pwd`/bundles:/go/src/github.com/dotcloud/docker/bundles docker hack/make.sh binary doc: - cd docs && docker build -t docker:docs . && docker run -p 8000:8000 docker:docs + cd docs && docker build -t docker-docs . && docker run -p 8000:8000 docker-docs -test: - docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test +test: bundles + docker run -privileged -v `pwd`/bundles:/go/src/github.com/dotcloud/docker/bundles docker hack/make.sh test shell: docker run -privileged -i -t docker bash + +bundles: + mkdir bundles +