Skip to content

Commit

Permalink
Minor fixes based on discussions on moby#2693
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fkautz committed Nov 30, 2013
1 parent 7267c4b commit 56ab9cb
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 56ab9cb

Please sign in to comment.