4d41fe0b80
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>
86 lines
2.7 KiB
Makefile
86 lines
2.7 KiB
Makefile
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration-cli test-docker-py validate
|
|
|
|
# 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 \
|
|
-e DOCKER_DEBUG \
|
|
-e DOCKER_EXECDRIVER \
|
|
-e DOCKER_EXPERIMENTAL \
|
|
-e DOCKER_REMAP_ROOT \
|
|
-e DOCKER_GRAPHDRIVER \
|
|
-e DOCKER_STORAGE_OPTS \
|
|
-e DOCKER_USERLANDPROXY \
|
|
-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
|
|
|
|
# to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`
|
|
# (default to no bind mount if DOCKER_HOST is set)
|
|
# 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)")
|
|
|
|
|
|
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
|
|
DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
|
|
DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
|
|
|
|
DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT)
|
|
|
|
# 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
|
|
|
|
DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
|
|
|
|
default: binary
|
|
|
|
all: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh
|
|
|
|
binary: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary
|
|
|
|
cross: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
|
|
|
|
deb: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary build-deb
|
|
|
|
rpm: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary build-rpm
|
|
|
|
test: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross test-unit test-integration-cli test-docker-py
|
|
|
|
test-unit: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
|
|
|
|
test-integration-cli: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-integration-cli
|
|
|
|
test-docker-py: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary test-docker-py
|
|
|
|
validate: build
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet
|
|
|
|
shell: build
|
|
$(DOCKER_RUN_DOCKER) bash
|
|
|
|
build: bundles
|
|
docker build -t "$(DOCKER_IMAGE)" .
|
|
|
|
bundles:
|
|
mkdir bundles
|
|
|
|
docs:
|
|
$(MAKE) -C docs docs
|