0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45929 from neersighted/with-go-mod_ROOTDIR

Browse source 
hack: use Git-free ROOTDIR
This commit is contained in:
Sebastiaan van Stijn 2023-07-19 19:23:00 +02:00 • committed by GitHub
commit 6b2ee07a26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/generate-authors.sh
View file

@ -3,7 +3,7 @@
set -e
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOTDIR="$(git -C "$SCRIPTDIR" rev-parse --show-toplevel)"
ROOTDIR="$(cd "${SCRIPTDIR}/.." && pwd)"
set -x

10
hack/make/.binary
View file

@ -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"

2
hack/validate/no-module
View file

@ -3,7 +3,7 @@
# Check that no one is trying to commit a go.mod.
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOTDIR="$(git -C "$SCRIPTDIR" rev-parse --show-toplevel)"
ROOTDIR="$(cd "${SCRIPTDIR}/../.." && pwd)"
if test -e "${ROOTDIR}/go.mod"; then
{

2
hack/with-go-mod.sh
View file

@ -9,7 +9,7 @@
set -e
SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOTDIR="$(git -C "$SCRIPTDIR" rev-parse --show-toplevel)"
ROOTDIR="$(cd "${SCRIPTDIR}/.." && pwd)"
if test -e "${ROOTDIR}/go.mod"; then
{