Skip to content

Add multi-architecture support for Docker images and workflows #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stearz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add multi-architecture support for Docker images and workflows #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jobs:
with:
go-version-file: go.mod

- name: Set up QEMU
Copy link
Copy Markdown
Contributor

@knechtionscoding knechtionscoding Mar 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My experience with this in #787 was that QEMU is very, very slow. like 60 minutes per run.

I swapped to running on ARM runners, example: https://github.com/datagravity-ai/kelos/blob/prod/.github/workflows/ci.yaml and it went to 2-3 minutes.

uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to GHCR
uses: docker/login-action@v3
with:
Expand All @@ -40,21 +46,14 @@ jobs:
echo "version=main" >> "$GITHUB_OUTPUT"
fi

- name: Build images
env:
VERSION: ${{ steps.version.outputs.version }}
run: make image VERSION="$VERSION"

- name: Push images
- name: Build and push images
env:
VERSION: ${{ steps.version.outputs.version }}
run: make push VERSION="$VERSION"
run: make image-multiarch VERSION="$VERSION"

- name: Push latest tags for releases
if: startsWith(github.ref, 'refs/tags/v')
run: |
make image VERSION=latest
make push VERSION=latest
run: make image-multiarch VERSION=latest

- name: Build CLI binaries
if: startsWith(github.ref, 'refs/tags/v')
Expand Down
34 changes: 30 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
REGISTRY ?= ghcr.io/kelos-dev
VERSION ?= latest
IMAGE_DIRS ?= cmd/kelos-controller cmd/kelos-spawner cmd/kelos-token-refresher claude-code codex gemini opencode cursor
LOCAL_ARCH ?= $(shell go env GOARCH)

# Version injection for the kelos CLI – only set ldflags when an explicit
# version is given so that dev builds fall through to runtime/debug info.
Expand Down Expand Up @@ -80,13 +81,16 @@ run: ## Run a controller from your host.
go run ./cmd/kelos-controller

.PHONY: image
image: ## Build docker images (use WHAT to build specific image).
image: ## Build docker images for the local platform (use WHAT to build specific image).
@for dir in $(filter cmd/%,$(or $(WHAT),$(IMAGE_DIRS))); do \
GOOS=linux GOARCH=amd64 $(MAKE) build WHAT=$$dir; \
name=$$(basename $$dir); \
GOOS=linux GOARCH=$(LOCAL_ARCH) $(MAKE) build WHAT=$$dir; \
cp bin/$$name bin/$${name}-linux-$(LOCAL_ARCH); \
done
@GOOS=linux GOARCH=amd64 $(MAKE) build WHAT=cmd/kelos-capture
@GOOS=linux GOARCH=$(LOCAL_ARCH) $(MAKE) build WHAT=cmd/kelos-capture
@cp bin/kelos-capture bin/kelos-capture-linux-$(LOCAL_ARCH)
@for dir in $(or $(WHAT),$(IMAGE_DIRS)); do \
docker build -t $(REGISTRY)/$$(basename $$dir):$(VERSION) -f $$dir/Dockerfile .; \
docker build -t $(REGISTRY)/$$(basename $$dir):$(VERSION) -f $$dir/Dockerfile . --build-arg TARGETARCH=$(LOCAL_ARCH); \
done

.PHONY: push
Expand All @@ -95,6 +99,28 @@ push: ## Push docker images (use WHAT to push specific image).
docker push $(REGISTRY)/$$(basename $$dir):$(VERSION); \
done

IMAGE_PLATFORMS ?= linux/amd64,linux/arm64
IMAGE_ARCHES = $(shell echo "$(IMAGE_PLATFORMS)" | tr ',' '\n' | cut -d'/' -f2 | tr '\n' ' ')

.PHONY: image-multiarch
image-multiarch: ## Build and push multi-platform docker images via buildx (use WHAT to build specific image).
@for dir in $(filter cmd/%,$(or $(WHAT),$(IMAGE_DIRS))); do \
name=$$(basename $$dir); \
for arch in $(IMAGE_ARCHES); do \
GOOS=linux GOARCH=$$arch $(MAKE) build WHAT=$$dir; \
mv bin/$$name bin/$${name}-linux-$$arch; \
done; \
done
@for arch in $(IMAGE_ARCHES); do \
GOOS=linux GOARCH=$$arch $(MAKE) build WHAT=cmd/kelos-capture; \
mv bin/kelos-capture bin/kelos-capture-linux-$$arch; \
done
@for dir in $(or $(WHAT),$(IMAGE_DIRS)); do \
docker buildx build --platform $(IMAGE_PLATFORMS) \
-t $(REGISTRY)/$$(basename $$dir):$(VERSION) \
-f $$dir/Dockerfile . --push; \
done

RELEASE_PLATFORMS ?= linux/amd64 linux/arm64 darwin/amd64 darwin/arm64

.PHONY: release-binaries
Expand Down
3 changes: 2 additions & 1 deletion claude-code/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ RUN npm install -g @anthropic-ai/claude-code@${CLAUDE_CODE_VERSION}
COPY claude-code/kelos_entrypoint.sh /kelos_entrypoint.sh
RUN chmod +x /kelos_entrypoint.sh

COPY bin/kelos-capture /kelos/kelos-capture
ARG TARGETARCH
COPY bin/kelos-capture-linux-${TARGETARCH} /kelos/kelos-capture

RUN useradd -u 61100 -m -s /bin/bash claude
RUN mkdir -p /home/claude/.claude && chown -R claude:claude /home/claude
Expand Down
3 changes: 2 additions & 1 deletion cmd/kelos-controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM gcr.io/distroless/static:nonroot
ARG TARGETARCH
WORKDIR /
COPY bin/kelos-controller .
COPY bin/kelos-controller-linux-${TARGETARCH} kelos-controller
USER 65532:65532
ENTRYPOINT ["/kelos-controller"]
3 changes: 2 additions & 1 deletion cmd/kelos-spawner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM gcr.io/distroless/static:nonroot
ARG TARGETARCH
WORKDIR /
COPY bin/kelos-spawner .
COPY bin/kelos-spawner-linux-${TARGETARCH} kelos-spawner
USER 65532:65532
ENTRYPOINT ["/kelos-spawner"]
3 changes: 2 additions & 1 deletion codex/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ RUN npm install -g @openai/codex@${CODEX_VERSION}
COPY codex/kelos_entrypoint.sh /kelos_entrypoint.sh
RUN chmod +x /kelos_entrypoint.sh

COPY bin/kelos-capture /kelos/kelos-capture
ARG TARGETARCH
COPY bin/kelos-capture-linux-${TARGETARCH} /kelos/kelos-capture

RUN useradd -u 61100 -m -s /bin/bash agent
RUN mkdir -p /home/agent/.codex && chown -R agent:agent /home/agent
Expand Down
3 changes: 2 additions & 1 deletion cursor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ ENV PATH="/usr/local/go/bin:${PATH}"
COPY cursor/kelos_entrypoint.sh /kelos_entrypoint.sh
RUN chmod +x /kelos_entrypoint.sh

COPY bin/kelos-capture /kelos/kelos-capture
ARG TARGETARCH
COPY bin/kelos-capture-linux-${TARGETARCH} /kelos/kelos-capture

RUN useradd -u 61100 -m -s /bin/bash agent
RUN mkdir -p /home/agent/.cursor && chown -R agent:agent /home/agent
Expand Down
3 changes: 2 additions & 1 deletion gemini/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ RUN npm install -g @google/gemini-cli@${GEMINI_CLI_VERSION}
COPY gemini/kelos_entrypoint.sh /kelos_entrypoint.sh
RUN chmod +x /kelos_entrypoint.sh

COPY bin/kelos-capture /kelos/kelos-capture
ARG TARGETARCH
COPY bin/kelos-capture-linux-${TARGETARCH} /kelos/kelos-capture

RUN useradd -u 61100 -m -s /bin/bash agent
RUN mkdir -p /home/agent/.gemini && chown -R agent:agent /home/agent
Expand Down
3 changes: 2 additions & 1 deletion opencode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ RUN npm install -g opencode-ai@${OPENCODE_VERSION}
COPY opencode/kelos_entrypoint.sh /kelos_entrypoint.sh
RUN chmod +x /kelos_entrypoint.sh

COPY bin/kelos-capture /kelos/kelos-capture
ARG TARGETARCH
COPY bin/kelos-capture-linux-${TARGETARCH} /kelos/kelos-capture

RUN useradd -u 61100 -m -s /bin/bash agent
RUN mkdir -p /home/agent/.opencode && chown -R agent:agent /home/agent
Expand Down
Loading