Skip to content

Make ucind work on arm64 again #380

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
miekg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make ucind work on arm64 again #380

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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ALPINE_VERSION=3.23.3

FROM golang:1.26.1-alpine AS uncloudd
FROM --platform=${BUILDPLATFORM} golang:1.26.1-alpine AS uncloudd

ARG TARGETOS
ARG TARGETARCH
Expand Down Expand Up @@ -38,7 +38,7 @@ COPY --from=corrosion-download /usr/bin/corrosion /usr/bin/corrosion
CMD ["corrosion", "agent"]


FROM alpine:${ALPINE_VERSION} AS corrosion-image-tarball
FROM --platform=${BUILDPLATFORM} alpine:${ALPINE_VERSION} AS corrosion-image-tarball
ARG CORROSION_VERSION
ARG CORROSION_IMAGE="ghcr.io/unlabs-dev/corrosion:${CORROSION_VERSION}"
ARG TARGETOS
Expand All @@ -48,7 +48,7 @@ RUN apk --no-cache add crane
RUN crane pull --platform ${TARGETOS}/${TARGETARCH} "${CORROSION_IMAGE}" /corrosion.tar

# Uncloud-in-Docker (ucind) image for running Uncloud test clusters using Docker.
FROM docker:29.4.0-dind AS ucind
FROM --platform=${BUILDPLATFORM} docker:29.4.0-dind AS ucind
ARG CORROSION_VERSION

# Create system group and user 'uncloud'.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ corrosion-multiarch-image-push:

.PHONY: ucind-multiarch-image-push
ucind-multiarch-image-push:
docker buildx build --push --platform linux/amd64,linux/arm64 -t "$(UCIND_IMAGE)" --target ucind .
docker buildx build --build-arg CORROSION_VERSION=$(CORROSION_VERSION) --push --platform linux/amd64,linux/arm64 -t "$(UCIND_IMAGE)" --target ucind .

.PHONY: mocks
mocks:
Expand Down
Loading