From cabfff826c4f7595681f227ac01236c57e78f3f1 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 13 May 2022 14:20:34 +0200 Subject: [PATCH] Makefile: cleanup vars Signed-off-by: CrazyMax --- Makefile | 13 ++++++------- docs/contributing/set-up-dev-env.md | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index a8bac3877ad6c..9cea9fc000028 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,6 @@ DOCKER_BUILDKIT ?= 1 DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //')) export DOCKER_GRAPHDRIVER -# 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) @@ -42,8 +40,13 @@ export VALIDATE_ORIGIN_BRANCH # DOCKER_ENVS := \ -e BUILD_APT_MIRROR \ - -e BUILDFLAGS \ -e KEEPBUNDLE \ + -e DOCKER_DEBUG \ + -e DOCKER_STRIP \ + -e DOCKER_LINKMODE \ + -e DOCKER_LDFLAGS \ + -e DOCKER_BUILDMODE \ + -e DOCKER_BUILDFLAGS \ -e DOCKER_BUILD_ARGS \ -e DOCKER_BUILD_GOGC \ -e DOCKER_BUILD_OPTS \ @@ -51,11 +54,9 @@ DOCKER_ENVS := \ -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_ROOTLESS \ @@ -71,8 +72,6 @@ DOCKER_ENVS := \ -e TESTDEBUG \ -e TESTDIRS \ -e TESTFLAGS \ - -e TESTFLAGS_INTEGRATION \ - -e TESTFLAGS_INTEGRATION_CLI \ -e TEST_FILTER \ -e TIMEOUT \ -e VALIDATE_REPO \ diff --git a/docs/contributing/set-up-dev-env.md b/docs/contributing/set-up-dev-env.md index a5ac77b09f2f8..8465920565aaf 100644 --- a/docs/contributing/set-up-dev-env.md +++ b/docs/contributing/set-up-dev-env.md @@ -130,7 +130,7 @@ can take over 15 minutes to complete. ```none Successfully built 3d872560918e Successfully tagged docker-dev:dry-run-test - docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/docker/docker/bundles" -t "docker-dev:dry-run-test" bash + docker run --rm -i --privileged -e DOCKER_BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -e DOCKER_BUILD_PKGS -e DOCKER_CLIENTONLY -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=devicemapper -e DOCKER_REMAP_ROOT -e DOCKER_STORAGE_OPTS -e DOCKER_USERLANDPROXY -e TESTDIRS -e TESTFLAGS -e TIMEOUT -v "home/ubuntu/repos/docker/bundles:/go/src/github.com/docker/docker/bundles" -t "docker-dev:dry-run-test" bash # ```