Skip to content

Commit 5315260

Browse files
authored
Merge pull request moby#51752 from thaJeztah/rm_unused_makevars
Makefile: remove unused or outdated make-vars
2 parents 97a43d8 + c6d2d69 commit 5315260

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ DOCKER_ENVS := \
2727
-e BUILDFLAGS \
2828
-e KEEPBUNDLE \
2929
-e DOCKER_BUILD_ARGS \
30-
-e DOCKER_BUILD_GOGC \
31-
-e DOCKER_BUILD_OPTS \
32-
-e DOCKER_BUILD_PKGS \
3330
-e DOCKER_BUILDKIT \
3431
-e DOCKER_CLI_PATH \
3532
-e DOCKERCLI_VERSION \
@@ -152,7 +149,7 @@ ifdef FIREWALLD
152149
DOCKER_BUILD_ARGS += --build-arg=FIREWALLD=true
153150
endif
154151

155-
BUILD_OPTS := ${DOCKER_BUILD_ARGS} ${DOCKER_BUILD_OPTS}
152+
BUILD_OPTS := ${DOCKER_BUILD_ARGS}
156153
BUILD_CMD := $(BUILDX) build
157154
BAKE_CMD := $(BUILDX) bake
158155

docs/contributing/set-up-dev-env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ can take over 15 minutes to complete.
129129

130130
```none
131131
Successfully built 3d872560918e
132-
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=vfs -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" bash
132+
docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_DEBUG -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT -e DOCKER_GRAPHDRIVER=vfs -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" bash
133133
#
134134
```
135135

hack/make/.binary

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
1414
source "${MAKEDIR}/.go-autogen"
1515

1616
(
17-
export GOGC=${DOCKER_BUILD_GOGC:-1000}
18-
1917
if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
2018
# must be cross-compiling!
2119
if [ "$(go env GOOS)/$(go env GOARCH)" = "linux/arm" ]; then

0 commit comments

Comments
 (0)