kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
moby--moby/Makefile

53 lines
1.5 KiB
Makefile
Raw Normal View History

initial version of cli integration tests Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-25 11:17:48 -05:00
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-integration test-integration-cli
Adding a makefile
2013-11-14 00:34:25 -05:00
Update Makefile with several improvements Especially but not limited to: - make BINDDIR= ... - for when you don't want a bind mount at all - make DOCSPORT=9000 docs - for when you want a not-8000 docs port - when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest") Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-02 00:43:38 -04:00
# to allow `make BINDDIR=. shell` or `make BINDDIR= test`
Add $BINDIR to allow mounting the whole sources if needed (for development) Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-28 21:40:16 -04:00
BINDDIR := bundles
Update Makefile with several improvements Especially but not limited to: - make BINDDIR= ... - for when you don't want a bind mount at all - make DOCSPORT=9000 docs - for when you want a not-8000 docs port - when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest") Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-02 00:43:38 -04:00
# to allow `make DOCSPORT=9000 docs`
DOCSPORT := 8000
Add $BINDIR to allow mounting the whole sources if needed (for development) Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-28 21:40:16 -04:00
Update Makefile with several improvements Especially but not limited to: - make BINDDIR= ... - for when you don't want a bind mount at all - make DOCSPORT=9000 docs - for when you want a not-8000 docs port - when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest") Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-02 00:43:38 -04:00
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
DOCKER_MOUNT := $(if $(BINDDIR),-v "$(CURDIR)/$(BINDDIR):/go/src/github.com/dotcloud/docker/$(BINDDIR)")
Add $BINDIR to allow mounting the whole sources if needed (for development) Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-28 21:40:16 -04:00
cli integration: allow driver selection via vars This makes it possible to choose the graphdriver and the execdriver which is going to be used for the cli integration tests. Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-04-04 12:03:07 -04:00
DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER $(DOCKER_MOUNT) "$(DOCKER_IMAGE)"
Update Makefile with several improvements Especially but not limited to: - make BINDDIR= ... - for when you don't want a bind mount at all - make DOCSPORT=9000 docs - for when you want a not-8000 docs port - when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest") Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-02 00:43:38 -04:00
DOCKER_RUN_DOCS := docker run --rm -it -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)"
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-03 17:51:43 -05:00
default: binary
all: build
$(DOCKER_RUN_DOCKER) hack/make.sh
binary: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary
Adding a makefile
2013-11-14 00:34:25 -05:00
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
2013-12-19 01:06:14 -05:00
cross: build
Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
2013-12-24 01:31:53 -05:00
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
2013-12-19 01:06:14 -05:00
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 21:23:30 -05:00
docs: docs-build
Update Makefile with several improvements Especially but not limited to: - make BINDDIR= ... - for when you don't want a bind mount at all - make DOCSPORT=9000 docs - for when you want a not-8000 docs port - when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest") Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-02 00:43:38 -04:00
$(DOCKER_RUN_DOCS)
Adding a makefile
2013-11-14 00:34:25 -05:00
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 21:23:30 -05:00
docs-shell: docs-build
Update Makefile with several improvements Especially but not limited to: - make BINDDIR= ... - for when you don't want a bind mount at all - make DOCSPORT=9000 docs - for when you want a not-8000 docs port - when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest") Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-02 00:43:38 -04:00
$(DOCKER_RUN_DOCS) bash
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 21:23:30 -05:00
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-03 17:51:43 -05:00
test: build
initial version of cli integration tests Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-25 11:17:48 -05:00
$(DOCKER_RUN_DOCKER) hack/make.sh binary test test-integration test-integration-cli
Adding a makefile
2013-11-14 00:34:25 -05:00
add make test-integration Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 18:50:23 -05:00
test-integration: build
$(DOCKER_RUN_DOCKER) hack/make.sh test-integration
initial version of cli integration tests Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-25 11:17:48 -05:00
test-integration-cli: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-integration-cli
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-03 17:51:43 -05:00
shell: build
$(DOCKER_RUN_DOCKER) bash
build: bundles
make docker build -rm=true default #4292 Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-02-23 11:32:12 -05:00
docker build -t "$(DOCKER_IMAGE)" .
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
2013-11-30 03:07:53 -05:00
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 21:23:30 -05:00
docs-build:
make docker build -rm=true default #4292 Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-02-23 11:32:12 -05:00
docker build -t "$(DOCKER_DOCS_IMAGE)" docs
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 21:23:30 -05:00
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
2013-11-30 03:07:53 -05:00
bundles:
mkdir bundles
Copy permalink