mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
Makefile: remove DOCKER_BUILD_GOGC
This option was added in 9672afa339 in 2016,
at which time tweaking GOGC showed a significant difference when building
the binary (`1m14.221s` vs `0m49.929s`).
Testing this Today doesn't show a real difference;
With GOGC=1000:
rm -rf bundles/
time hack/make.sh binary
real 0m15.303s
user 0m26.285s
sys 0m6.383s
real 0m4.931s
user 0m3.103s
sys 0m1.670s
real 0m5.693s
user 0m3.827s
sys 0m2.384s
Without GOGC set;
real 0m5.012s
user 0m3.689s
sys 0m1.549s
real 0m5.298s
user 0m3.997s
sys 0m1.695s
real 0m4.899s
user 0m3.579s
sys 0m1.423s
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
1
Makefile
1
Makefile
@@ -27,7 +27,6 @@ DOCKER_ENVS := \
|
|||||||
-e BUILDFLAGS \
|
-e BUILDFLAGS \
|
||||||
-e KEEPBUNDLE \
|
-e KEEPBUNDLE \
|
||||||
-e DOCKER_BUILD_ARGS \
|
-e DOCKER_BUILD_ARGS \
|
||||||
-e DOCKER_BUILD_GOGC \
|
|
||||||
-e DOCKER_BUILDKIT \
|
-e DOCKER_BUILDKIT \
|
||||||
-e DOCKER_CLI_PATH \
|
-e DOCKER_CLI_PATH \
|
||||||
-e DOCKERCLI_VERSION \
|
-e DOCKERCLI_VERSION \
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ can take over 15 minutes to complete.
|
|||||||
|
|
||||||
```none
|
```none
|
||||||
Successfully built 3d872560918e
|
Successfully built 3d872560918e
|
||||||
docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -e DOCKER_BUILD_GOGC -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
|
docker run --rm -i --privileged -e BUILDFLAGS -e KEEPBUNDLE -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
|
||||||
#
|
#
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
|
|||||||
source "${MAKEDIR}/.go-autogen"
|
source "${MAKEDIR}/.go-autogen"
|
||||||
|
|
||||||
(
|
(
|
||||||
export GOGC=${DOCKER_BUILD_GOGC:-1000}
|
|
||||||
|
|
||||||
if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
|
if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
|
||||||
# must be cross-compiling!
|
# must be cross-compiling!
|
||||||
if [ "$(go env GOOS)/$(go env GOARCH)" = "linux/arm" ]; then
|
if [ "$(go env GOOS)/$(go env GOARCH)" = "linux/arm" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user