Browse code
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
Frederick F. Kautz IV authored on 2013/11/30 17:07:53Showing 1 changed files
| ... | ... |
@@ -1,14 +1,18 @@ |
| 1 | 1 |
default: build |
| 2 | 2 |
|
| 3 |
-build: |
|
| 3 |
+build: bundles |
|
| 4 | 4 |
docker build -t docker . |
| 5 |
- docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary |
|
| 5 |
+ docker run -privileged -v `pwd`/bundles:/go/src/github.com/dotcloud/docker/bundles docker hack/make.sh binary |
|
| 6 | 6 |
|
| 7 | 7 |
doc: |
| 8 |
- cd docs && docker build -t docker:docs . && docker run -p 8000:8000 docker:docs |
|
| 8 |
+ cd docs && docker build -t docker-docs . && docker run -p 8000:8000 docker-docs |
|
| 9 | 9 |
|
| 10 |
-test: |
|
| 11 |
- docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test |
|
| 10 |
+test: bundles |
|
| 11 |
+ docker run -privileged -v `pwd`/bundles:/go/src/github.com/dotcloud/docker/bundles docker hack/make.sh test |
|
| 12 | 12 |
|
| 13 | 13 |
shell: |
| 14 | 14 |
docker run -privileged -i -t docker bash |
| 15 |
+ |
|
| 16 |
+bundles: |
|
| 17 |
+ mkdir bundles |
|
| 18 |
+ |