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

86 lines
2.7 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 07:56:45 -04: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 00:34:25 -05: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 18:04:13 -05: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 08:22:44 -04:00
-e DOCKER_DEBUG \
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 18:09:58 -04:00
-e DOCKER_EXPERIMENTAL \
add test-integration-cli specifics for userns Signed-off-by: Jessica Frazelle <acidburn@docker.com> Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-18 13:41:12 -04:00
-e DOCKER_REMAP_ROOT \
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 18:04:13 -05: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 02:39:15 -04: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 18:39:29 -04: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 18:04:13 -05: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 17:50:42 -05: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 12:50:48 -04: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 17:50:42 -05: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 18:04:13 -05: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-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)
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-01 20:28:08 -04: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 00:43:38 -04: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-28 21:40:16 -04:00
Makefile: don't allocate pseudo-tty if not interactive In cases where we are running non-interactively (e.g. on Jenkins), we shouldn't try to allocate a TTY, which would fail. This patch makes the flag `-t` be dependent on whether the shell session is interactive or not. When it is interactive, it's important to have `-t` so that the user can pass signals through to the process. We also remove the DOCKER_RUN_DOCS and the GITCOMMIT variables, which are no longer in use in this Makefile (seems like the related targets that used it were migrated to docs/Makefile). Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
2015-10-20 23:10:49 -04:00
DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT)
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 18:04:13 -05:00
Makefile: don't allocate pseudo-tty if not interactive In cases where we are running non-interactively (e.g. on Jenkins), we shouldn't try to allocate a TTY, which would fail. This patch makes the flag `-t` be dependent on whether the shell session is interactive or not. When it is interactive, it's important to have `-t` so that the user can pass signals through to the process. We also remove the DOCKER_RUN_DOCS and the GITCOMMIT variables, which are no longer in use in this Makefile (seems like the related targets that used it were migrated to docs/Makefile). Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
2015-10-20 23:10:49 -04:00
# if this session isn't interactive, then we don't want to allocate a
# TTY, which would fail, but if it is interactive, we do want to attach
# so that the user can send e.g. ^C through.
INTERACTIVE := $(shell [ -t 0 ] && echo 1 || echo 0)
ifeq ($(INTERACTIVE), 1)
DOCKER_FLAGS += -t
endif
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 18:04:13 -05:00
Makefile: don't allocate pseudo-tty if not interactive In cases where we are running non-interactively (e.g. on Jenkins), we shouldn't try to allocate a TTY, which would fail. This patch makes the flag `-t` be dependent on whether the shell session is interactive or not. When it is interactive, it's important to have `-t` so that the user can pass signals through to the process. We also remove the DOCKER_RUN_DOCS and the GITCOMMIT variables, which are no longer in use in this Makefile (seems like the related targets that used it were migrated to docs/Makefile). Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
2015-10-20 23:10:49 -04:00
DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-24 19:37:36 -05:00
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
add deb and rpm targets to dockerfile Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-09 17:51:02 -04: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-15 23:25:37 -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
Remove integration tests and port them to integration-cli Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-29 07:56:45 -04: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 18:49:03 -04:00
test-unit: build
$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
Adding a makefile
2013-11-14 00:34:25 -05: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 11:17:48 -05: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 02:20:59 -05: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-16 20:56:02 -04:00
validate: build
Add golint to the development toolbox Add golint to the Dockerfile, and a `validate-lint` task to the Makefile. Currently, the linter will process a harcoded list of packages that will expand as we fix more warnings. Eventually, the linter should process all subpackages of the repo (excluding vendored code). Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-20 21:32:55 -04:00
$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-lint 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-16 20:56:02 -04:00
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
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 11:48:14 -04:00
docs:
$(MAKE) -C docs docs
Copy permalink