From e67f9dadc6cf5c7b4410e268d2a550cb18249f4a Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 11 Jul 2023 07:36:17 -0600 Subject: [PATCH] hack/make/.binary: use with-go-mod.sh Signed-off-by: Bjorn Neergaard (cherry picked from commit a972dbd682ec41e64a8ed95decf901ee040f003c) Signed-off-by: Sebastiaan van Stijn --- hack/make/.binary | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hack/make/.binary b/hack/make/.binary index 90d16f11a2..b73051f2a9 100644 --- a/hack/make/.binary +++ b/hack/make/.binary @@ -74,19 +74,11 @@ source "${MAKEDIR}/.go-autogen" fi fi - # This is a workaround to have buildinfo with deps embedded in the binary. We - # need to create a go.mod file before building with -modfile=vendor.mod, - # otherwise it fails with: "-modfile cannot be used to set the module root directory." - if [ ! -f "go.mod" ]; then - printf '%s\n\n%s' 'module github.com/docker/docker' 'go 1.19' > "go.mod" - trap 'rm -f go.mod' EXIT - fi - echo "Building $([ "$DOCKER_STATIC" = "1" ] && echo "static" || echo "dynamic") $DEST/$BINARY_FULLNAME ($PLATFORM_NAME)..." if [ -n "$DOCKER_DEBUG" ]; then set -x fi - GO111MODULE=on go build -mod=vendor -modfile=vendor.mod -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" ${GO_PACKAGE} + ./hack/with-go-mod.sh go build -mod=vendor -modfile=vendor.mod -o "$DEST/$BINARY_FULLNAME" "${BUILDFLAGS[@]}" -ldflags "$LDFLAGS $LDFLAGS_STATIC $DOCKER_LDFLAGS" "$GO_PACKAGE" ) echo "Created binary: $DEST/$BINARY_FULLNAME"