rename BUILDFLAGS to GOBUILDFLAGS

Signed-off-by: Alex Couture-Beil <[email protected]>

Author: Alex Couture-Beil

.github/CONTRIBUTING.md

@@ -158,7 +158,7 @@ TESTPKGS=./client TESTFLAGS="--run //worker=containerd -v" ./hack/test integrati
 DOCKERFILE_RELEASES=labs TESTFLAGS="--run /TestRunGlobalNetwork/worker=oci$/ -v" ./hack/test dockerfile
 
 # enabling go data race detector
-CGO_ENABLED=1 BUILDFLAGS="-race" ./hack/test integration
+CGO_ENABLED=1 GOBUILDFLAGS="-race" ./hack/test integration
 ```
 
 Set `TEST_KEEP_CACHE=1` for the test framework to keep external dependant images in a docker volume

Dockerfile

@@ -94,13 +94,13 @@ FROM buildkit-base AS buildkitd
 # BUILDKITD_TAGS defines additional Go build tags for compiling buildkitd
 ARG BUILDKITD_TAGS
 ARG TARGETPLATFORM
-ARG BUILDFLAGS
+ARG GOBUILDFLAGS
 ARG VERIFYFLAGS="--static"
 ARG CGO_ENABLED=0
 RUN --mount=target=. --mount=target=/root/.cache,type=cache \
   --mount=target=/go/pkg/mod,type=cache \
   --mount=source=/tmp/.ldflags,target=/tmp/.ldflags,from=buildkit-version \
-  xx-go build ${BUILDFLAGS} -ldflags "$(cat /tmp/.ldflags) -extldflags '-static'" -tags "osusergo netgo static_build seccomp ${BUILDKITD_TAGS}" -o /usr/bin/buildkitd ./cmd/buildkitd && \
+  xx-go build ${GOBUILDFLAGS} -ldflags "$(cat /tmp/.ldflags) -extldflags '-static'" -tags "osusergo netgo static_build seccomp ${BUILDKITD_TAGS}" -o /usr/bin/buildkitd ./cmd/buildkitd && \
   xx-verify ${VERIFYFLAGS} /usr/bin/buildkitd
 
 FROM scratch AS binaries-linux

Makefile

@@ -36,7 +36,7 @@ test:
 
 .PHONY: test-race
 test-race:
-	CGO_ENABLED=1 BUILDFLAGS="-race" ./hack/test integration gateway dockerfile
+	CGO_ENABLED=1 GOBUILDFLAGS="-race" ./hack/test integration gateway dockerfile
 
 .PHONY: lint
 lint:

hack/test

@@ -13,7 +13,7 @@ set -eu -o pipefail
 : ${TEST_DOCKERD_BINARY=$(which dockerd)}
 : ${TEST_REPORT_SUFFIX=}
 : ${TEST_KEEP_CACHE=}
-: ${BUILDFLAGS=}
+: ${GOBUILDFLAGS=}
 : ${VERIFYFLAGS=}
 : ${CGO_ENABLED=}
 : ${DOCKERFILE_RELEASES=}
@@ -63,7 +63,7 @@ testReportsVol="-v $testReportsDir:/testreports"
 gotestsumArgs="--format=standard-verbose --jsonfile=/testreports/go-test-report$TEST_REPORT_SUFFIX.json --junitfile=/testreports/junit-report$TEST_REPORT_SUFFIX.xml"
 gotestArgs="-mod=vendor -coverprofile=/testreports/coverage-report$TEST_REPORT_SUFFIX.txt -covermode=atomic"
 
-if [[ "$BUILDFLAGS" == *"-race"* ]]; then
+if [[ "$GOBUILDFLAGS" == *"-race"* ]]; then
   if [ "$CGO_ENABLED" != "1" ]; then
     echo>&2 "go race detector requires CGO_ENABLED=1"
     exit 1
@@ -78,7 +78,7 @@ buildxCmd build $cacheFromFlags \
   --build-arg HTTP_PROXY \
   --build-arg HTTPS_PROXY \
   --build-arg NO_PROXY \
-  --build-arg BUILDFLAGS \
+  --build-arg GOBUILDFLAGS \
   --build-arg VERIFYFLAGS \
   --build-arg CGO_ENABLED \
   --target "integration-tests" \