fix: revert jammy build, fix dynamic executable (#314)

replicatedcom · Jun 6, 2023 · d1f507b · d1f507b
1 parent 34e74cb
commit d1f507b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 \