updated Make for multiple targets and updated security.yaml to use make and bake.

Author: ausbru87

.github/workflows/security.yaml

@@ -62,26 +62,19 @@ jobs:
           go-version-file: "go.mod"
 
       - name: Build binary for linux/amd64
-        run: |
-          TAG=$(git describe --always)
-          mkdir -p bin
-          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
-            -ldflags "-X github.com/coder/code-marketplace/buildinfo.tag=${TAG}" \
-            -o bin/code-marketplace-linux-amd64 \
-            ./cmd/marketplace/main.go
+        run: make build/linux/amd64
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Build Docker image
         id: build
         run: |
-          docker buildx build \
-            --platform linux/amd64 \
-            --tag code-marketplace:scan \
-            --load \
-            --build-arg TARGETARCH=amd64 \
-            .
+          docker buildx bake \
+            -f ./docker-bake.hcl \
+            --set "*.platform=linux/amd64" \
+            --set "*.tags=code-marketplace:scan" \
+            --load
           echo "image=code-marketplace:scan" >> "$GITHUB_OUTPUT"
 
       - name: Run Trivy vulnerability scanner (table output for logs)

Makefile

@@ -27,6 +27,11 @@ upload:
 
 TAG=$(shell git describe --always)
 
+build/linux/amd64:
+	mkdir -p bin
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X github.com/coder/code-marketplace/buildinfo.tag=$(TAG)" -o bin/code-marketplace-linux-amd64 ./cmd/marketplace/main.go
+.PHONY: build/linux/amd64
+
 build:
 	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "-X github.com/coder/code-marketplace/buildinfo.tag=$(TAG)" -o bin/code-marketplace-mac-amd64 ./cmd/marketplace/main.go
 	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags "-X github.com/coder/code-marketplace/buildinfo.tag=$(TAG)" -o bin/code-marketplace-mac-arm64 ./cmd/marketplace/main.go