Makefile: cleanup unused vars

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
moby · Dec 20, 2022 · bd076dd · bd076dd
1 parent ab12a9e
commit bd076dd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -34,10 +34,9 @@ DOCKER_ENVS := \
 	-e BUILD_APT_MIRROR \
 	-e KEEPBUNDLE \
 	-e DOCKER_BUILDFLAGS \
+	-e DOCKER_BUILDTAGS \
 	-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 \
@@ -66,8 +65,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/TESTING.md b/TESTING.md
@@ -108,9 +108,6 @@ the list of dirs in the TEST_INTEGRATION_DIR environment variable.
 You can also explicitly skip either suite by setting (any value) in
 TEST_SKIP_INTEGRATION and/or TEST_SKIP_INTEGRATION_CLI environment variables.
 
-Flags specific to each suite can be set in the TESTFLAGS_INTEGRATION and
-TESTFLAGS_INTEGRATION_CLI environment variables.
-
 If all you want is to specify a test filter to run, you can set the
 `TEST_FILTER` environment variable. This ends up getting passed directly to `go
 test -run` (or `go test -check-f`, depending on the test suite). It will also

diff --git 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 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
+   docker run --rm -i --privileged -e KEEPBUNDLE -e DOCKER_BUILDFLAGS -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
    #
    ```