Skip to content

Modern Docker Management, Designed for Everyone

refactor: add armv7 platform to docker builds (#1865)

dampflok2000a0b5eb20676d
diff --git a/.github/workflows/build-next-images.yml b/.github/workflows/build-next-images.yml
index f7215d254..a4bf2c104 100644
--- a/.github/workflows/build-next-images.yml
+++ b/.github/workflows/build-next-images.yml
@@ -114,7 +114,7 @@ jobs:
with:
context: .
file: docker/Dockerfile
- platforms: linux/amd64,linux/arm64
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.manager-meta.outputs.tags }}
labels: ${{ steps.manager-meta.outputs.labels }}
@@ -151,7 +151,7 @@ jobs:
with:
context: .
file: docker/Dockerfile-agent
- platforms: linux/amd64,linux/arm64
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.agent-meta.outputs.tags }}
labels: ${{ steps.agent-meta.outputs.labels }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b01369c94..94c130caf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -92,7 +92,7 @@ jobs:
with:
context: .
file: docker/Dockerfile
- platforms: linux/amd64,linux/arm64
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.manager-meta.outputs.tags }}
labels: ${{ steps.manager-meta.outputs.labels }}
@@ -130,7 +130,7 @@ jobs:
with:
context: .
file: docker/Dockerfile-agent
- platforms: linux/amd64,linux/arm64
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: ${{ steps.agent-meta.outputs.tags }}
labels: ${{ steps.agent-meta.outputs.labels }}
diff --git a/Justfile b/Justfile
index b51025d67..33aa94e85 100644
--- a/Justfile
+++ b/Justfile
@@ -606,13 +606,13 @@ _build-backend:
# Build manager container image
[group('build')]
-_build-image-manager tag="arcane:latest" flag='':
- docker buildx build {{ if flag == "--push" { "--push" } else { "" } }} --platform linux/arm64,linux/amd64 -f 'docker/Dockerfile' --build-arg ENABLED_FEATURES="{{ env('ENABLED_FEATURES', env('BUILD_FEATURES', '')) }}" -t "{{ tag }}" .
+_build-image-manager tag="ghcr.io/getarcaneapp/arcane:development" flag='':
+ docker buildx build {{ if flag == "--push" { "--push" } else { "" } }} --platform linux/arm64,linux/amd64,linux/arm/v7 -f 'docker/Dockerfile' --build-arg ENABLED_FEATURES="{{ env('ENABLED_FEATURES', env('BUILD_FEATURES', '')) }}" -t "{{ tag }}" .
# Build agent container image
[group('build')]
-_build-image-agent tag="arcane-agent:latest" flag='':
- docker buildx build {{ if flag == "--push" { "--push" } else { "" } }} --platform linux/arm64,linux/amd64 -f 'docker/Dockerfile-agent' --build-arg ENABLED_FEATURES="{{ env('ENABLED_FEATURES', env('BUILD_FEATURES', '')) }}" -t "{{ tag }}" .
+_build-image-agent tag="ghcr.io/getarcaneapp/arcane-headless:development" flag='':
+ docker buildx build {{ if flag == "--push" { "--push" } else { "" } }} --platform linux/arm64,linux/amd64,linux/arm/v7 -f 'docker/Dockerfile-agent' --build-arg ENABLED_FEATURES="{{ env('ENABLED_FEATURES', env('BUILD_FEATURES', '')) }}" -t "{{ tag }}" .
# Build both frontend and backend
[group('build')]
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d6256754d..3a20abf67 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -27,12 +27,13 @@ RUN pnpm -C frontend build
# Stage 2: Build Backend
FROM --platform=$BUILDPLATFORM golang:1.26-trixie AS backend-builder
ARG TARGETARCH
+ARG TARGETVARIANT
ARG BUILD_TAGS
ARG VERSION="dev"
ARG REVISION="unknown"
WORKDIR /build
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl git tzdata jq \
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl git tzdata jq \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
COPY go.work ./
@@ -49,7 +50,13 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
if [ "${VERSION}" = "dev" ]; then VERSION=$(jq -r '.version // "dev"' ../arcane.json); fi && \
if [ "${REVISION}" = "unknown" ]; then REVISION=$(jq -r '.revision // "unknown"' ../arcane.json); fi && \
BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') && \
- CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH \
+ export GOARCH="${TARGETARCH}" && \
+ if [ "${TARGETARCH}" = "arm" ]; then \
+ GOARM="${TARGETVARIANT#v}"; \
+ if [ -z "${GOARM}" ]; then GOARM="7"; fi; \
+ export GOARM; \
+ fi && \
+ CGO_ENABLED=0 GOOS=linux \
go build \
-tags "${BUILD_TAGS}" \
-ldflags "-w -s -X github.com/getarcaneapp/arcane/backend/internal/config.Version=${VERSION} -X github.com/getarcaneapp/arcane/backend/internal/config.Revision=${REVISION} -X github.com/getarcaneapp/arcane/backend/internal/config.BuildTime=${BUILD_TIME}" \
diff --git a/docker/Dockerfile-agent b/docker/Dockerfile-agent
index eb5b055db..d8c26935d 100644
--- a/docker/Dockerfile-agent
+++ b/docker/Dockerfile-agent
@@ -4,6 +4,7 @@ ARG REVISION="unknown"
FROM --platform=$BUILDPLATFORM golang:1.26-trixie AS agent-builder
ARG TARGETARCH
+ARG TARGETVARIANT
ARG BUILD_TAGS="exclude_frontend"
ARG VERSION="dev"
ARG REVISION="unknown"
@@ -26,7 +27,13 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
if [ "${VERSION}" = "dev" ]; then VERSION=$(jq -r '.version // "dev"' ../arcane.json); fi && \
if [ "${REVISION}" = "unknown" ]; then REVISION=$(jq -r '.revision // "unknown"' ../arcane.json); fi && \
BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') && \
- CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH \
+ export GOARCH="${TARGETARCH}" && \
+ if [ "${TARGETARCH}" = "arm" ]; then \
+ GOARM="${TARGETVARIANT#v}"; \
+ if [ -z "${GOARM}" ]; then GOARM="7"; fi; \
+ export GOARM; \
+ fi && \
+ CGO_ENABLED=0 GOOS=linux \
go build \
-tags "${BUILD_TAGS}" \
-ldflags "-w -s -X github.com/getarcaneapp/arcane/backend/internal/config.Version=${VERSION} -X github.com/getarcaneapp/arcane/backend/internal/config.Revision=${REVISION} -X github.com/getarcaneapp/arcane/backend/internal/config.BuildTime=${BUILD_TIME}" \