Fix Docker builds and compose args for different providers

Author: kipz

Dockerfile

@@ -31,9 +31,9 @@ ADD ./internal/ $APP_ROOT/src/internal/
 
 ARG SERVER_LDFLAGS
 # Build server for deployment
-RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -ldflags "${SERVER_LDFLAGS}" -o rekor-server ./cmd/rekor-server-${CLOUD_PROVIDER}
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -tags ${CLOUD_PROVIDER} -ldflags "${SERVER_LDFLAGS}" -o rekor-server ./cmd/rekor-server-${CLOUD_PROVIDER}
 # Build server for debugger
-RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "${SERVER_LDFLAGS}" -o rekor-server_debug ./cmd/rekor-server-${CLOUD_PROVIDER}
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -tags ${CLOUD_PROVIDER} -gcflags "all=-N -l" -ldflags "${SERVER_LDFLAGS}" -o rekor-server_debug ./cmd/rekor-server-${CLOUD_PROVIDER}
 
 # Multi-stage deployment build
 FROM golang:1.25.3@sha256:6d4e5e74f47db00f7f24da5f53c1b4198ae46862a47395e30477365458347bf2 AS deploy

Makefile

@@ -101,7 +101,7 @@ ko-local: ## Build container images locally using ko
 	ko publish --base-import-paths \
 		--tags $(GIT_VERSION)-aws --tags $(GIT_HASH) --image-refs rekorImagerefs-aws \
 		github.com/sigstore/rekor-tiles/v2/cmd/rekor-server-aws
-	cat rekorImagerefs-gcp rekorImagerefs-aws > rekorImagerefs
+	cp rekorImagerefs-gcp rekorImagerefs
 
 # generate Go protobuf code
 protos:

compose.yml

@@ -49,6 +49,8 @@ services:
     build:
       context: .
       target: deploy
+      args:
+        CLOUD_PROVIDER: gcp
     environment:
     - SPANNER_EMULATOR_HOST=spanner:9010
     - STORAGE_EMULATOR_HOST=gcs:7080

docker-compose-aws.yml

@@ -74,6 +74,8 @@ services:
     build:
       context: .
       target: deploy
+      args:
+        CLOUD_PROVIDER: aws
     environment:
       - AWS_ACCESS_KEY_ID=minioadmin
       - AWS_SECRET_ACCESS_KEY=minioadmin

tests/sharding/compose.yml

@@ -104,6 +104,8 @@ services:
     build:
       context: ../..
       target: deploy
+      args:
+        CLOUD_PROVIDER: gcp
     environment:
     - SPANNER_EMULATOR_HOST=spanner1:9010
     - STORAGE_EMULATOR_HOST=gcs1:7080
@@ -145,6 +147,8 @@ services:
     build:
       context: ../..
       target: deploy
+      args:
+        CLOUD_PROVIDER: gcp
     environment:
     - SPANNER_EMULATOR_HOST=spanner2:9010
     - STORAGE_EMULATOR_HOST=gcs2:7080