From 04362619c5b932edc5e251042616cc1d718d83a2 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Thu, 14 Nov 2013 05:34:25 +0000 Subject: [PATCH 1/3] Adding a makefile Upstream-commit: 26533eb2c419155b93e3f403d081fb3c52d4dc45 Component: engine --- components/engine/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 components/engine/Makefile diff --git a/components/engine/Makefile b/components/engine/Makefile new file mode 100644 index 0000000000..a207424e77 --- /dev/null +++ b/components/engine/Makefile @@ -0,0 +1,14 @@ +default: build + +build: + sudo docker build -t docker . + sudo docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary + +doc: + cd docs && docker build -t docker:docs . && docker run -p 8000:8000 docker:docs + +test: + sudo docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test + +shell: + sudo docker run -privileged -i -t docker bash From d9f05e38d8171d062d0e2e689e8571ec02d35b44 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Thu, 14 Nov 2013 05:53:53 +0000 Subject: [PATCH 2/3] Removing sudo Upstream-commit: 7267c4b746ad3b86d1174aeed4c06679476e8a27 Component: engine --- components/engine/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index a207424e77..1447a4ed12 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -1,14 +1,14 @@ default: build build: - sudo docker build -t docker . - sudo docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary + docker build -t docker . + docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary doc: cd docs && docker build -t docker:docs . && docker run -p 8000:8000 docker:docs test: - sudo docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test + docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test shell: - sudo docker run -privileged -i -t docker bash + docker run -privileged -i -t docker bash 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 3/3] 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 +