37fe68f5d6
This patch removes the `BUILDX_COMMIT` make variable. With the
make variable removed, it no longer "masks" environment variables,
and there is no longer a need to export the variable.
A side effect of this change, is that (by default), the buildx
image is tagged as `moby-buildx:latest`. This likely isn't a
problem, because the build-cache would still be preserved in
intermediate images. Having the image tagged as `:latest` also
makes cleaning up easier (without having to remove the image
for each version tagged.
Otherwise, the behavior remains the same as before:
# default
rm -f bundles/buildx && make buildx
# => => naming to docker.io/library/moby-buildx:latest
github.com/docker/buildx v0.3.0 c967f1d
# using a make variable:
rm -f bundles/buildx && make BUILDX_COMMIT=v0.2.1 buildx
# => => naming to docker.io/library/moby-buildx:v0.2.1
github.com/docker/buildx v0.2.1 0eb2df5
# using an environment variable:
rm -f bundles/buildx && BUILDX_COMMIT=v0.2.2 make buildx
# => => naming to docker.io/library/moby-buildx:v0.2.2
github.com/docker/buildx v0.2.2 ab5fe3d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
273 lines
10 KiB
Makefile
273 lines
10 KiB
Makefile
.PHONY: all binary dynbinary build cross help install manpages run shell test test-docker-py test-integration test-unit validate win
|
|
|
|
ifdef USE_BUILDX
|
|
BUILDX ?= $(shell command -v buildx)
|
|
BUILDX ?= $(shell command -v docker-buildx)
|
|
DOCKER_BUILDX_CLI_PLUGIN_PATH ?= ~/.docker/cli-plugins/docker-buildx
|
|
BUILDX ?= $(shell if [ -x "$(DOCKER_BUILDX_CLI_PLUGIN_PATH)" ]; then echo $(DOCKER_BUILDX_CLI_PLUGIN_PATH); fi)
|
|
endif
|
|
|
|
ifndef USE_BUILDX
|
|
DOCKER_BUILDKIT := 1
|
|
export DOCKER_BUILDKIT
|
|
endif
|
|
|
|
BUILDX ?= bundles/buildx
|
|
DOCKER ?= docker
|
|
|
|
# set the graph driver as the current graphdriver if not set
|
|
DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //'))
|
|
export DOCKER_GRAPHDRIVER
|
|
|
|
# enable/disable cross-compile
|
|
DOCKER_CROSS ?= false
|
|
|
|
# get OS/Arch of docker engine
|
|
DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH}')
|
|
DOCKERFILE := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKERFILE}')
|
|
|
|
DOCKER_GITCOMMIT := $(shell git rev-parse --short HEAD || echo unsupported)
|
|
export DOCKER_GITCOMMIT
|
|
|
|
# allow overriding the repository and branch that validation scripts are running
|
|
# against these are used in hack/validate/.validate to check what changed in the PR.
|
|
export VALIDATE_REPO
|
|
export VALIDATE_BRANCH
|
|
export VALIDATE_ORIGIN_BRANCH
|
|
|
|
# env vars passed through directly to Docker's build scripts
|
|
# to allow things like `make KEEPBUNDLE=1 binary` easily
|
|
# `project/PACKAGERS.md` have some limited documentation of some of these
|
|
#
|
|
# DOCKER_LDFLAGS can be used to pass additional parameters to -ldflags
|
|
# option of "go build". For example, a built-in graphdriver priority list
|
|
# can be changed during build time like this:
|
|
#
|
|
# make DOCKER_LDFLAGS="-X github.com/docker/docker/daemon/graphdriver.priority=overlay2,devicemapper" dynbinary
|
|
#
|
|
DOCKER_ENVS := \
|
|
-e DOCKER_CROSSPLATFORMS \
|
|
-e BUILD_APT_MIRROR \
|
|
-e BUILDFLAGS \
|
|
-e KEEPBUNDLE \
|
|
-e DOCKER_BUILD_ARGS \
|
|
-e DOCKER_BUILD_GOGC \
|
|
-e DOCKER_BUILD_OPTS \
|
|
-e DOCKER_BUILD_PKGS \
|
|
-e DOCKER_BUILDKIT \
|
|
-e DOCKER_BASH_COMPLETION_PATH \
|
|
-e DOCKER_CLI_PATH \
|
|
-e DOCKER_DEBUG \
|
|
-e DOCKER_EXPERIMENTAL \
|
|
-e DOCKER_GITCOMMIT \
|
|
-e DOCKER_GRAPHDRIVER \
|
|
-e DOCKER_LDFLAGS \
|
|
-e DOCKER_PORT \
|
|
-e DOCKER_REMAP_ROOT \
|
|
-e DOCKER_STORAGE_OPTS \
|
|
-e DOCKER_TEST_HOST \
|
|
-e DOCKER_USERLANDPROXY \
|
|
-e DOCKERD_ARGS \
|
|
-e TEST_INTEGRATION_DIR \
|
|
-e TEST_SKIP_INTEGRATION \
|
|
-e TEST_SKIP_INTEGRATION_CLI \
|
|
-e TESTDEBUG \
|
|
-e TESTDIRS \
|
|
-e TESTFLAGS \
|
|
-e TESTFLAGS_INTEGRATION \
|
|
-e TESTFLAGS_INTEGRATION_CLI \
|
|
-e TEST_FILTER \
|
|
-e TIMEOUT \
|
|
-e VALIDATE_REPO \
|
|
-e VALIDATE_BRANCH \
|
|
-e VALIDATE_ORIGIN_BRANCH \
|
|
-e HTTP_PROXY \
|
|
-e HTTPS_PROXY \
|
|
-e NO_PROXY \
|
|
-e http_proxy \
|
|
-e https_proxy \
|
|
-e no_proxy \
|
|
-e VERSION \
|
|
-e PLATFORM \
|
|
-e DEFAULT_PRODUCT_LICENSE \
|
|
-e PRODUCT
|
|
# 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 can be overriden, but use at your own risk!
|
|
ifndef DOCKER_MOUNT
|
|
DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)")
|
|
DOCKER_MOUNT := $(if $(DOCKER_BINDDIR_MOUNT_OPTS),$(DOCKER_MOUNT):$(DOCKER_BINDDIR_MOUNT_OPTS),$(DOCKER_MOUNT))
|
|
|
|
# This allows the test suite to be able to run without worrying about the underlying fs used by the container running the daemon (e.g. aufs-on-aufs), so long as the host running the container is running a supported fs.
|
|
# The volume will be cleaned up when the container is removed due to `--rm`.
|
|
# Note that `BIND_DIR` will already be set to `bundles` if `DOCKER_HOST` is not set (see above BIND_DIR line), in such case this will do nothing since `DOCKER_MOUNT` will already be set.
|
|
DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docker/docker/bundles) -v "$(CURDIR)/.git:/go/src/github.com/docker/docker/.git"
|
|
|
|
DOCKER_MOUNT_CACHE := -v docker-dev-cache:/root/.cache
|
|
DOCKER_MOUNT_CLI := $(if $(DOCKER_CLI_PATH),-v $(shell dirname $(DOCKER_CLI_PATH)):/usr/local/cli,)
|
|
DOCKER_MOUNT_BASH_COMPLETION := $(if $(DOCKER_BASH_COMPLETION_PATH),-v $(shell dirname $(DOCKER_BASH_COMPLETION_PATH)):/usr/local/completion/bash,)
|
|
DOCKER_MOUNT := $(DOCKER_MOUNT) $(DOCKER_MOUNT_CACHE) $(DOCKER_MOUNT_CLI) $(DOCKER_MOUNT_BASH_COMPLETION)
|
|
endif # ifndef DOCKER_MOUNT
|
|
|
|
# This allows to set the docker-dev container name
|
|
DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),)
|
|
|
|
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
|
|
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
|
|
DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
|
|
DOCKER_PORT_FORWARD := $(if $(DOCKER_PORT),-p "$(DOCKER_PORT)",)
|
|
|
|
DOCKER_FLAGS := $(DOCKER) run --rm -i --privileged $(DOCKER_CONTAINER_NAME) $(DOCKER_ENVS) $(DOCKER_MOUNT) $(DOCKER_PORT_FORWARD)
|
|
BUILD_APT_MIRROR := $(if $(DOCKER_BUILD_APT_MIRROR),--build-arg APT_MIRROR=$(DOCKER_BUILD_APT_MIRROR))
|
|
export BUILD_APT_MIRROR
|
|
|
|
SWAGGER_DOCS_PORT ?= 9000
|
|
|
|
define \n
|
|
|
|
|
|
endef
|
|
|
|
# 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 ## validate all checks, build linux binaries, run all tests\ncross build non-linux binaries and generate archives
|
|
$(DOCKER_RUN_DOCKER) bash -c 'hack/validate/default && hack/make.sh'
|
|
|
|
binary: DOCKER_BUILD_ARGS += --output=bundles/ --target=binary
|
|
binary: build ## build the linux binaries
|
|
|
|
dynbinary: DOCKER_BUILD_ARGS += --output=bundles/ --target=dynbinary
|
|
dynbinary: build ## build the linux dynbinaries
|
|
|
|
cross: DOCKER_BUILD_ARGS += --output=bundles/ --target=cross --build-arg DOCKER_CROSSPLATFORMS=$(DOCKER_CROSSPLATFORMS)
|
|
cross: DOCKER_CROSS := true
|
|
cross: build ## cross build the binaries for darwin, freebsd and\nwindows
|
|
|
|
ifdef DOCKER_CROSSPLATFORMS
|
|
build: DOCKER_CROSS := true
|
|
endif
|
|
build: DOCKER_BUILD_ARGS += --build-arg=CROSS=$(DOCKER_CROSS)
|
|
ifdef GO_VERSION
|
|
build: DOCKER_BUILD_ARGS += --build-arg=GO_VERSION=$(GO_VERSION)
|
|
endif
|
|
ifdef USE_BUILDX
|
|
build: bundles buildx
|
|
$(BUILDX) build ${BUILD_APT_MIRROR} ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" $(BUILDX_BUILD_EXTRA_OPTS) .
|
|
else
|
|
build: bundles
|
|
$(DOCKER) build ${BUILD_APT_MIRROR} ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" .
|
|
endif
|
|
|
|
bundles:
|
|
mkdir bundles
|
|
|
|
.PHONY: clean
|
|
clean: clean-cache
|
|
|
|
.PHONY: clean-cache
|
|
clean-cache:
|
|
docker volume rm -f docker-dev-cache
|
|
|
|
help: ## this help
|
|
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {gsub("\\\\n",sprintf("\n%22c",""), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
|
|
|
|
install: ## install the linux binaries
|
|
KEEPBUNDLE=1 hack/make.sh install-binary
|
|
|
|
run: build ## run the docker daemon in a container
|
|
$(DOCKER_RUN_DOCKER) sh -c "KEEPBUNDLE=1 hack/make.sh install-binary run"
|
|
|
|
ifeq ($(BIND_DIR), .)
|
|
shell: DOCKER_BUILD_ARGS += --target=dev
|
|
else
|
|
shell: DOCKER_BUILD_ARGS += --target=final
|
|
endif
|
|
shell: BUILDX_BUILD_EXTRA_OPTS += --load
|
|
shell: build ## start a shell inside the build env
|
|
$(DOCKER_RUN_DOCKER) bash
|
|
|
|
test: build test-unit ## run the unit, integration and docker-py tests
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary cross test-integration test-docker-py
|
|
|
|
test-docker-py: build ## run the docker-py tests
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py
|
|
|
|
test-integration-cli: test-integration ## (DEPRECATED) use test-integration
|
|
|
|
ifneq ($(and $(TEST_SKIP_INTEGRATION),$(TEST_SKIP_INTEGRATION_CLI)),)
|
|
test-integration:
|
|
@echo Both integrations suites skipped per environment variables
|
|
else
|
|
test-integration: build ## run the integration tests
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-integration
|
|
endif
|
|
|
|
test-integration-flaky: build ## run the stress test for all new integration tests
|
|
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-integration-flaky
|
|
|
|
test-unit: build ## run the unit tests
|
|
$(DOCKER_RUN_DOCKER) hack/test/unit
|
|
|
|
validate: build ## validate DCO, Seccomp profile generation, gofmt,\n./pkg/ isolation, golint, tests, tomls, go vet and vendor
|
|
$(DOCKER_RUN_DOCKER) hack/validate/all
|
|
|
|
win: build ## cross build the binary for windows
|
|
$(DOCKER_RUN_DOCKER) DOCKER_CROSSPLATFORMS=windows/amd64 hack/make.sh cross
|
|
|
|
.PHONY: swagger-gen
|
|
swagger-gen:
|
|
docker run --rm -v $(PWD):/go/src/github.com/docker/docker \
|
|
-w /go/src/github.com/docker/docker \
|
|
--entrypoint hack/generate-swagger-api.sh \
|
|
-e GOPATH=/go \
|
|
quay.io/goswagger/swagger:0.7.4
|
|
|
|
.PHONY: swagger-docs
|
|
swagger-docs: ## preview the API documentation
|
|
@echo "API docs preview will be running at http://localhost:$(SWAGGER_DOCS_PORT)"
|
|
@docker run --rm -v $(PWD)/api/swagger.yaml:/usr/share/nginx/html/swagger.yaml \
|
|
-e 'REDOC_OPTIONS=hide-hostname="true" lazy-rendering' \
|
|
-p $(SWAGGER_DOCS_PORT):80 \
|
|
bfirsh/redoc:1.6.2
|
|
|
|
.PHONY: buildx
|
|
ifeq ($(BUILDX), bundles/buildx)
|
|
buildx: bundles/buildx # build buildx cli tool
|
|
else
|
|
buildx:
|
|
endif
|
|
|
|
bundles/buildx: BUILDX_DOCKERFILE ?= Dockerfile.buildx
|
|
bundles/buildx: bundles ## build buildx CLI tool
|
|
# This intetionally is not using the `--output` flag from the docker CLI which is a buildkit option
|
|
# The idea here being that if buildx is being used, it's because buildkit is not supported natively
|
|
docker build -f $(BUILDX_DOCKERFILE) -t "moby-buildx:$${BUILDX_COMMIT:-latest}" \
|
|
--build-arg BUILDX_COMMIT \
|
|
--build-arg BUILDX_REPO \
|
|
--build-arg GOOS=$$(if [ -n "$(GOOS)" ]; then echo $(GOOS); else go env GOHOSTOS || uname | awk '{print tolower($$0)}' || true; fi) \
|
|
--build-arg GOARCH=$$(if [ -n "$(GOARCH)" ]; then echo $(GOARCH); else go env GOHOSTARCH || true; fi) \
|
|
.
|
|
|
|
id=$$(docker create moby-buildx:$${BUILDX_COMMIT:-latest}); \
|
|
if [ -n "$${id}" ]; then \
|
|
docker cp $${id}:/usr/bin/buildx $@ \
|
|
&& touch $@; \
|
|
docker rm -f $${id}; \
|
|
fi
|
|
|
|
$@ version
|