beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
moby/Makefile

81 lines
2.6 KiB
Makefile
Raw Normal View History

Remove integration tests and port them to integration-cli Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-29 11:56:45 +00:00
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration-cli test-docker-py validate
Adding a makefile
2013-11-14 05:34:25 +00:00
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
# env vars passed through directly to Docker's build scripts
# to allow things like `make DOCKER_CLIENTONLY=1 binary` easily
# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these
DOCKER_ENVS := \
-e BUILDFLAGS \
-e DOCKER_CLIENTONLY \
Restore DEBUG as DOCKER_DEBUG (removed in #10665), add as make variable Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-05-07 12:22:44 +00:00
-e DOCKER_DEBUG \
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
-e DOCKER_EXECDRIVER \
Add DOCKER_EXPERIMENTAL environment variable The DOCKER_EXPERIMENTAL environment variable drives the activation of the 'experimental' build tag. Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-19 22:09:58 +00:00
-e DOCKER_EXPERIMENTAL \
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
-e DOCKER_GRAPHDRIVER \
integration: add variable to set storage options for testing Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-15 06:39:15 +00:00
-e DOCKER_STORAGE_OPTS \
Docker integration with libnetwork - Updated Dockerfile to satisfy libnetwork GOPATH requirements. - Reworked daemon to allocate network resources using libnetwork. - Reworked remove link code to also update network resources in libnetwork. - Adjusted the exec driver command population to reflect libnetwork design. - Adjusted the exec driver create command steps. - Updated a few test cases to reflect the change in design. - Removed the dns setup code from docker as resolv.conf is entirely managed in libnetwork. - Integrated with lxc exec driver. Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-06 22:39:29 +00:00
-e DOCKER_USERLANDPROXY \
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
-e TESTDIRS \
-e TESTFLAGS \
-e TIMEOUT
# note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
Rename BINDDIR to BIND_DIR It turns out the back-to-back `D`s here were tripping people up because visually, it looks like a typo. This renames the variable to `BIND_DIR`, but allows `BINDDIR` to continue working for backwards-compatibility. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-13 22:50:42 +00:00
# to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`
Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users). Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 16:50:48 +00:00
# (default to no bind mount if DOCKER_HOST is set)
Rename BINDDIR to BIND_DIR It turns out the back-to-back `D`s here were tripping people up because visually, it looks like a typo. This renames the variable to `BIND_DIR`, but allows `BINDDIR` to continue working for backwards-compatibility. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-13 22:50:42 +00:00
# note: BINDDIR is supported for backwards-compatibility here
BIND_DIR := $(if $(BINDDIR),$(BINDDIR),$(if $(DOCKER_HOST),,bundles))
DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)")
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
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-29 01:40:16 +00: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 04:43:38 +00:00
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
Rename development builds to be in the "docker-dev" repo instead of "docker" See https://github.com/docker-library/docker/issues/2 for some of the context around this; essentially, we're looking to create an official `docker` image that includes the Docker CLI (and the dependencies necessary for easy Docker-in-Docker), but it makes sense to use the `docker` namespace for that image. The `docker-dev` official image is already builds of Docker's own `Dockerfile` (but specifically of releases), so this seemed like a good fit. :+1: Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-02 00:28:08 +00:00
DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
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 04:43:38 +00:00
DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
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-29 01:40:16 +00:00
Allow a few more DOCKER_* env vars to pass thru Makefile I was trying to just build the Docker client but DOCKER_CLIENTONLY wasn't getting passed thru from the shell to the container building docker. So, this PR passes this var (via the -e option) on the docker run command so we pick it up from the devs shell when running "make ...". While in there I pulled all of the "-e" options into a new Makefile variable so its easy to see just the list of env vars we pass along. Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-13 19:06:50 +00:00
DOCKER_RUN_DOCKER := docker run --rm -it --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT) "$(DOCKER_IMAGE)"
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
Update docs release script so we can have autodeploys to docs.master.dockerproject.com. - Make the invaidation profile the bucket variable, not hard coded. - Add no cache variable for settings cache to "no-cache" Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-09 20:10:54 +00:00
DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
Add some minor reorganization to the Makefile preamble The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process). Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-13 23:04:13 +00:00
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-25 00:37:36 +00:00
# for some docs workarounds (see below in "docs-build" target)
GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-03 22:51:43 +00: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 05:34:25 +00: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 06:06:14 +00: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 06:31:53 +00: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 06:06:14 +00:00
add deb and rpm targets to dockerfile Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-09 21:51:02 +00:00
deb: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary build-deb
rpm: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary build-rpm
add Scott's link checker script, and fix what it finds Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-12-16 04:25:37 +00:00
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-03 22:51:43 +00:00
test: build
Remove integration tests and port them to integration-cli Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-29 11:56:45 +00:00
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross test-unit test-integration-cli test-docker-py
Add new test-unit make rule which only runs the unit tests. Renames test bundle to test-unit. Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
2014-04-29 22:49:03 +00:00
test-unit: build
$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
Adding a makefile
2013-11-14 05:34:25 +00:00
initial version of cli integration tests Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-25 16:17:48 +00:00
test-integration-cli: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-integration-cli
Tweak test-docker-py feature - move docker/docker-py clone to the Dockerfile - put "integration test daemon startup" code in a separate file for both scripts to source - add new test-docker-py Makefile target - include "python-websocket" package in Dockerfile for running the tests Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-19 07:20:59 +00:00
test-docker-py: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-docker-py
Add "validate" Makefile target This was supposed to be part of my previous PR, but somehow got missed. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-17 00:56:02 +00:00
validate: build
Add new "validate-pkg" bundlescript This helps ensure that `github.com/docker/docker/pkg/...` is actually safe to use in isolation (ie, doesn't import anything from `github.com/docker/docker` except other things from `pkg` or vendored dependencies). Adding `github.com/docker/docker/utils` to the imports of `pkg/version/version.go`: ``` ---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg) These files import internal code: (either directly or indirectly) - pkg/version/version.go imports github.com/docker/docker/autogen/dockerversion - pkg/version/version.go imports github.com/docker/docker/utils ``` And then removing it again: ``` ---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg) Congratulations! "./pkg/..." is safely isolated from internal code. ``` Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-06-12 19:19:56 +00:00
$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-test validate-toml validate-vet
Add "validate" Makefile target This was supposed to be part of my previous PR, but somehow got missed. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-17 00:56:02 +00:00
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-03 22:51:43 +00: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 16:32:12 +00: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 08:07:53 +00:00
bundles:
mkdir bundles
Add back top-level "make docs" Just to make life easier on devs so they don't need to 'cd' into the docs dir just to test their docs edits. This doesn't do anything more than "cd docs && make docs" so that all of the smarts are still in the docs's Makefile and not in docker's. Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-19 15:48:14 +00:00
docs:
$(MAKE) -C docs docs
Reference in a new issue Copy permalink