From d1f507b754e4ae0256f6e424360ea914fcfcbf8c Mon Sep 17 00:00:00 2001
From: Ethan Mosbaugh <ethan@replicated.com>
Date: Tue, 6 Jun 2023 16:24:59 -0700
Subject: [PATCH] fix: revert jammy build, fix dynamic executable (#314)

---
 .goreleaser.yml        | 2 ++
 Makefile               | 8 ++++----
 deploy/Dockerfile-base | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index c3b50617..83238500 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -27,6 +27,8 @@ builds:
     goarch:
       - amd64
       - "386"
+    env:
+      - CGO_ENABLED=0
     main: cmd/support-bundle/main.go
     ldflags: -s -w
       -X github.com/replicatedcom/support-bundle/pkg/version.version={{.Version}}
diff --git a/Makefile b/Makefile
index f0328d2c..0cf98b48 100644
--- a/Makefile
+++ b/Makefile
@@ -91,8 +91,8 @@ _mockgen:
 mockgen: _mockgen fmt
 
 bin/analyze: $(SRC) pkg/analyze/api/v1/defaultspec/asset.go
-	go build \
-		-ldflags " \
+	CGO_ENABLED=0 go build \
+		-ldflags " -s -w \
 		-X $(PKG)/pkg/version.version=$(VERSION) \
 		-X $(PKG)/pkg/version.gitSHA=$(SHA) \
 		-X $(PKG)/pkg/version.buildTime=$(BUILD_TIME) \
@@ -102,8 +102,8 @@ bin/analyze: $(SRC) pkg/analyze/api/v1/defaultspec/asset.go
 	@echo built bin/analyze
 
 bin/support-bundle: $(SRC) pkg/collect/bundle/defaultspec/asset.go
-	go build \
-		-ldflags " \
+	CGO_ENABLED=0 go build \
+		-ldflags " -s -w \
 		-X $(PKG)/pkg/version.version=$(VERSION) \
 		-X $(PKG)/pkg/version.gitSHA=$(SHA) \
 		-X $(PKG)/pkg/version.buildTime=$(BUILD_TIME) \
diff --git a/deploy/Dockerfile-base b/deploy/Dockerfile-base
index dd17f320..c6272441 100644
--- a/deploy/Dockerfile-base
+++ b/deploy/Dockerfile-base
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:buster-slim
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && apt-get install --no-install-recommends -y \
     ca-certificates \