Update build-wolfi.sh scripts to match latest build.sh scripts

cmd/frontend/build-wolfi.sh

@@ -18,11 +18,10 @@ export CGO_ENABLED=0
 
 echo "--- go build"
 pkg="github.com/sourcegraph/sourcegraph/cmd/frontend"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 echo "--- docker build $IMAGE"
 docker build -f cmd/frontend/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/github-proxy/build-wolfi.sh

@@ -10,17 +10,34 @@ cleanup() {
 }
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+
+  bazel build //cmd/github-proxy \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/github-proxy --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/github-proxy/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
 export GOOS=linux
 export CGO_ENABLED=0
 
 pkg="github.com/sourcegraph/sourcegraph/cmd/github-proxy"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 docker build -f cmd/github-proxy/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/gitserver/build-wolfi.sh

@@ -12,17 +12,33 @@ cleanup() {
 
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+  bazel build //cmd/gitserver \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/gitserver --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/gitserver/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
 export GOOS=linux
 export CGO_ENABLED=0
 
 pkg="github.com/sourcegraph/sourcegraph/cmd/gitserver"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 docker build -f cmd/gitserver/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/loadtest/build-wolfi.sh

@@ -10,17 +10,34 @@ cleanup() {
 }
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+
+  bazel build //cmd/loadtest \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/loadtest --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/loadtest/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
 export GOOS=linux
 export CGO_ENABLED=0
 
 pkg="github.com/sourcegraph/sourcegraph/cmd/loadtest"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 docker build -f cmd/loadtest/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/migrator/build-wolfi.sh

@@ -3,14 +3,32 @@
 # This script builds the migrator docker image.
 
 cd "$(dirname "${BASH_SOURCE[0]}")/../.."
-set -eu
+set -ex
 
 OUTPUT=$(mktemp -d -t sgdockerbuild_XXXXXXX)
 cleanup() {
   rm -rf "$OUTPUT"
 }
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+
+  bazel build //cmd/migrator \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/migrator --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/migrator/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
@@ -21,7 +39,7 @@ echo "--- go build"
 pkg=${1:-"github.com/sourcegraph/sourcegraph/cmd/migrator"}
 output="$OUTPUT/$(basename "$pkg")"
 # shellcheck disable=SC2153
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$output" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$output" "$pkg"
 
 echo "--- compile schema descriptions"
 mkdir -p "${OUTPUT}/schema-descriptions"
@@ -75,7 +93,12 @@ git_versions=(
   v3.42.0 v3.42.1 v3.42.2
   v3.43.0 v3.43.1 v3.43.2
   v4.0.0 v4.0.1
-  v4.1.0 v4.1.1 v4.1.2
+  v4.1.0 v4.1.1 v4.1.2 v4.1.3
+  v4.2.0 v4.2.1
+  v4.3.0 v4.3.1
+  v4.4.0 v4.4.1 v4.4.2
+  v4.5.0 v4.5.1
+  v5.0.0
 )
 for version in "${git_versions[@]}"; do
   echo "Persisting schemas for ${version} from Git..."
@@ -86,7 +109,6 @@ done
 
 echo "--- docker build"
 docker build -f cmd/migrator/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/repo-updater/build-wolfi.sh

@@ -9,20 +9,37 @@ OUTPUT=$(mktemp -d -t sgdockerbuild_XXXXXXX)
 cleanup() {
   rm -rf "$OUTPUT"
 }
+
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+  bazel build //cmd/repo-updater \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/repo-updater --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/repo-updater/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
 export GOOS=linux
 export CGO_ENABLED=0
 
 for pkg in $path_to_package; do
-  bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename "$pkg")" "$pkg"
+  go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename "$pkg")" "$pkg"
 done
 
 docker build -f cmd/repo-updater/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/searcher/build-wolfi.sh

@@ -10,17 +10,33 @@ cleanup() {
 }
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+  bazel build //cmd/searcher \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/searcher --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/searcher/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
 export GOOS=linux
 export CGO_ENABLED=0
 
 pkg="github.com/sourcegraph/sourcegraph/cmd/searcher"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 docker build -f cmd/searcher/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/server/build-wolfi.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# TODO: This is untested and WIP
-
 # We want to build multiple go binaries, so we use a custom build step on CI.
 cd "$(dirname "${BASH_SOURCE[0]}")/../.."
 set -eux
@@ -101,7 +99,6 @@ IMAGE=sourcegraph/blobstore:server docker-images/blobstore/build-wolfi.sh
 
 echo "--- docker build"
 docker build -f cmd/server/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/symbols/build-wolfi.sh

@@ -7,7 +7,6 @@ set -eu
 
 echo "--- docker build symbols"
 docker build -f cmd/symbols/Dockerfile.wolfi -t "$IMAGE" "$(pwd)" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

cmd/worker/build-wolfi.sh

@@ -11,6 +11,24 @@ cleanup() {
 }
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+
+  bazel build //cmd/worker \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64
+
+  out=$(bazel cquery //cmd/worker --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f cmd/worker/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
@@ -22,7 +40,7 @@ pkg="github.com/sourcegraph/sourcegraph/cmd/worker"
 go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 echo "--- docker build"
-docker build -f cmd/worker/Dockerfile -t "$IMAGE" "$OUTPUT" \
+docker build -f cmd/worker/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

enterprise/cmd/batcheshelper/build-wolfi.sh

@@ -16,7 +16,7 @@ export GOOS=linux
 export CGO_ENABLED=0
 
 pkg="github.com/sourcegraph/sourcegraph/enterprise/cmd/batcheshelper"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 docker build -f enterprise/cmd/batcheshelper/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
   --platform="${PLATFORM:-linux/amd64}" \

enterprise/cmd/frontend/build-wolfi.sh

@@ -11,6 +11,24 @@ cleanup() {
 }
 trap cleanup EXIT
 
+if [[ "${DOCKER_BAZEL:-false}" == "true" ]]; then
+  bazel build //enterprise/cmd/frontend \
+    --stamp \
+    --workspace_status_command=./dev/bazel_stamp_vars.sh \
+    --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
+    --//:assets_bundle_type=enterprise
+
+  out=$(bazel cquery //enterprise/cmd/frontend --output=files)
+  cp "$out" "$OUTPUT"
+
+  docker build -f enterprise/cmd/frontend/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
+    --progress=plain \
+    --build-arg COMMIT_SHA \
+    --build-arg DATE \
+    --build-arg VERSION
+  exit $?
+fi
+
 # Environment for building linux binaries
 export GO111MODULE=on
 export GOARCH=amd64
@@ -19,11 +37,10 @@ export CGO_ENABLED=0
 
 echo "--- go build"
 pkg="github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
 echo "--- docker build"
 docker build -f enterprise/cmd/frontend/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \

enterprise/cmd/gitserver/build-wolfi.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # We want to build multiple go binaries, so we use a custom build step on CI.
-cd "$(dirname "${BASH_SOURCE[0]}")"/../..
+cd "$(dirname "${BASH_SOURCE[0]}")/../../.."
 set -ex
 
 OUTPUT=$(mktemp -d -t sgdockerbuild_XXXXXXX)
@@ -18,11 +18,10 @@ export GOARCH=amd64
 export GOOS=linux
 export CGO_ENABLED=0
 
-pkg="github.com/sourcegraph/sourcegraph/cmd/gitserver"
-bazel run @go_sdk//:bin/go -- build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
+pkg="github.com/sourcegraph/sourcegraph/enterprise/cmd/gitserver"
+go build -trimpath -ldflags "-X github.com/sourcegraph/sourcegraph/internal/version.version=$VERSION  -X github.com/sourcegraph/sourcegraph/internal/version.timestamp=$(date +%s)" -buildmode exe -tags dist -o "$OUTPUT/$(basename $pkg)" "$pkg"
 
-docker build -f cmd/gitserver/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
-  --platform="${PLATFORM:-linux/amd64}" \
+docker build -f enterprise/cmd/gitserver/Dockerfile.wolfi -t "$IMAGE" "$OUTPUT" \
   --progress=plain \
   --build-arg COMMIT_SHA \
   --build-arg DATE \