Skip to content

Lightweight server monitoring with historical data, docker stats, and alerts.

fix(docker): build arm/v6 images with GOARM=6 (#2637)

Sven van Ginkel2e9f4ef4a791
diff --git a/internal/dockerfile_agent b/internal/dockerfile_agent
index e7b95be05..91dac89e7 100644
--- a/internal/dockerfile_agent
+++ b/internal/dockerfile_agent
@@ -11,8 +11,11 @@ COPY . ./
RUN apk add --no-cache ca-certificates && update-ca-certificates
# Build
-ARG TARGETOS TARGETARCH
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./internal/cmd/agent
+ARG TARGETOS TARGETARCH TARGETVARIANT
+RUN if [ "$TARGETARCH" = "arm" ] && [ -n "$TARGETVARIANT" ]; then \
+ export GOARM="${TARGETVARIANT#v}"; \
+ fi; \
+ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./internal/cmd/agent
RUN rm -rf /tmp/*
diff --git a/internal/dockerfile_agent_alpine b/internal/dockerfile_agent_alpine
index 04c9ffae5..b3d88555a 100644
--- a/internal/dockerfile_agent_alpine
+++ b/internal/dockerfile_agent_alpine
@@ -9,8 +9,11 @@ RUN go mod download
COPY . ./
# Build
-ARG TARGETOS TARGETARCH
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./internal/cmd/agent
+ARG TARGETOS TARGETARCH TARGETVARIANT
+RUN if [ "$TARGETARCH" = "arm" ] && [ -n "$TARGETVARIANT" ]; then \
+ export GOARM="${TARGETVARIANT#v}"; \
+ fi; \
+ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./internal/cmd/agent
RUN rm -rf /tmp/*
diff --git a/internal/dockerfile_hub b/internal/dockerfile_hub
index 9833ee22f..0f53c0d5e 100644
--- a/internal/dockerfile_hub
+++ b/internal/dockerfile_hub
@@ -16,8 +16,11 @@ RUN apk add --no-cache \
RUN update-ca-certificates
# Build
-ARG TARGETOS TARGETARCH
-RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./internal/cmd/hub
+ARG TARGETOS TARGETARCH TARGETVARIANT
+RUN if [ "$TARGETARCH" = "arm" ] && [ -n "$TARGETVARIANT" ]; then \
+ export GOARM="${TARGETVARIANT#v}"; \
+ fi; \
+ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./internal/cmd/hub
# ? -------------------------
FROM scratch