From 29758a067ff5b12c12c76ec7335aa3e40aa49078 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 27 Dec 2022 01:36:10 +0100 Subject: [PATCH] IAmStatic not used anymore Signed-off-by: CrazyMax (cherry picked from commit 84ea9ee0f90d54e8a9bafbc35c86b5c4be31cd35) --- dockerversion/version_lib.go | 1 - hack/make.sh | 1 - hack/make/.go-autogen | 1 - hack/make/dynbinary-daemon | 1 - hack/make/dynbinary-proxy | 1 - 5 files changed, 5 deletions(-) diff --git a/dockerversion/version_lib.go b/dockerversion/version_lib.go index 0004619f02..c510e269e0 100644 --- a/dockerversion/version_lib.go +++ b/dockerversion/version_lib.go @@ -6,7 +6,6 @@ var ( GitCommit = "library-import" Version = "library-import" BuildTime = "library-import" - IAmStatic = "library-import" PlatformName = "" ProductName = "" DefaultProductLicense = "" diff --git a/hack/make.sh b/hack/make.sh index 85bf430dff..5205742990 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -102,7 +102,6 @@ fi # Use these flags when compiling the tests and final binary -IAMSTATIC='true' if [ -z "$DOCKER_DEBUG" ]; then LDFLAGS='-w' fi diff --git a/hack/make/.go-autogen b/hack/make/.go-autogen index 07205f5f4b..de1708dce7 100644 --- a/hack/make/.go-autogen +++ b/hack/make/.go-autogen @@ -4,7 +4,6 @@ LDFLAGS="${LDFLAGS} \ -X \"github.com/docker/docker/dockerversion.Version=${VERSION}\" \ -X \"github.com/docker/docker/dockerversion.GitCommit=${GITCOMMIT}\" \ -X \"github.com/docker/docker/dockerversion.BuildTime=${BUILDTIME}\" \ - -X \"github.com/docker/docker/dockerversion.IAmStatic=${IAMSTATIC:-true}\" \ -X \"github.com/docker/docker/dockerversion.PlatformName=${PLATFORM}\" \ -X \"github.com/docker/docker/dockerversion.ProductName=${PRODUCT}\" \ -X \"github.com/docker/docker/dockerversion.DefaultProductLicense=${DEFAULT_PRODUCT_LICENSE}\" \ diff --git a/hack/make/dynbinary-daemon b/hack/make/dynbinary-daemon index 7d659695d4..efb69df754 100644 --- a/hack/make/dynbinary-daemon +++ b/hack/make/dynbinary-daemon @@ -4,7 +4,6 @@ set -e [ -z "$KEEPDEST" ] && rm -rf "$DEST" ( - export IAMSTATIC='false' export LDFLAGS_STATIC_DOCKER='' export BUILDFLAGS=("${BUILDFLAGS[@]/netgo /}") # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo diff --git a/hack/make/dynbinary-proxy b/hack/make/dynbinary-proxy index ff408b299e..048bd9d2b2 100644 --- a/hack/make/dynbinary-proxy +++ b/hack/make/dynbinary-proxy @@ -3,7 +3,6 @@ set -e ( - export IAMSTATIC='false' export LDFLAGS_STATIC_DOCKER='' export BUILDFLAGS=("${BUILDFLAGS[@]/netgo /}") # disable netgo, since we don't need it for a dynamic binary export BUILDFLAGS=("${BUILDFLAGS[@]/osusergo /}") # ditto for osusergo