From 79eb42d04d2ae56812e05d97a52082a457bc0d75 Mon Sep 17 00:00:00 2001 From: henrygd Date: Wed, 19 Feb 2025 21:05:31 -0500 Subject: [PATCH] add CGO_ENABLED=0 back to docker images / goreleaser config --- beszel/.goreleaser.yml | 13 +++++++------ beszel/dockerfile_Agent | 2 +- beszel/dockerfile_Hub | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/beszel/.goreleaser.yml b/beszel/.goreleaser.yml index 6b38ba0..4f91d78 100644 --- a/beszel/.goreleaser.yml +++ b/beszel/.goreleaser.yml @@ -10,8 +10,8 @@ builds: - id: beszel binary: beszel main: cmd/hub/hub.go - # env: - # - CGO_ENABLED=0 + env: + - CGO_ENABLED=0 goos: - linux - darwin @@ -23,8 +23,8 @@ builds: - id: beszel-agent binary: beszel-agent main: cmd/agent/agent.go - # env: - # - CGO_ENABLED=0 + env: + - CGO_ENABLED=0 goos: - linux - darwin @@ -84,8 +84,9 @@ nfpms: - beszel-agent formats: - deb - dependencies: - - libc6 + # don't think this is needed with CGO_ENABLED=0 + # dependencies: + # - libc6 contents: - src: ../supplemental/debian/beszel-agent.service dst: lib/systemd/system/beszel-agent.service diff --git a/beszel/dockerfile_Agent b/beszel/dockerfile_Agent index 65a345a..362337d 100644 --- a/beszel/dockerfile_Agent +++ b/beszel/dockerfile_Agent @@ -10,7 +10,7 @@ COPY internal ./internal # Build ARG TARGETOS TARGETARCH -RUN GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./cmd/agent +RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./cmd/agent # ? ------------------------- FROM scratch diff --git a/beszel/dockerfile_Hub b/beszel/dockerfile_Hub index 4f94c95..d7160ec 100644 --- a/beszel/dockerfile_Hub +++ b/beszel/dockerfile_Hub @@ -22,7 +22,7 @@ RUN update-ca-certificates # Build ARG TARGETOS TARGETARCH -RUN GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./cmd/hub +RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./cmd/hub # ? ------------------------- FROM scratch