Skip to content

build: enable multi-platform image publishing again #36

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

Merged
jbw976 merged 1 commit into from
Sep 17, 2025
+6 −3
Merged

build: enable multi-platform image publishing again #36

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
5 changes: 4 additions & 1 deletion cluster/images/conformance/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ WORKDIR /go
RUN go get -u github.com/jstemmer/go-junit-report@v0.9.1

FROM BASEIMAGE
ARG TARGETOS
ARG TARGETARCH

COPY --from=0 /go/bin/go-junit-report /usr/local/bin/
ADD conformance /usr/local/bin/
COPY tests/${TARGETOS}_${TARGETARCH}/tests /usr/local/bin/conformance

@jbw976 jbw976 Sep 17, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

this pattern comes from https://github.com/crossplane/crossplane/blob/release-1.16/cluster/images/crossplane/Dockerfile

ADD run.sh /usr/local/bin/
EXPOSE 8080
USER 65532
Expand Down
4 changes: 2 additions & 2 deletions cluster/images/conformance/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ endif

img.build.shared:
@cp Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL)
@cp $(OUTPUT_DIR)/tests/linux_$(ARCH)/tests $(IMAGE_TEMP_DIR)/conformance || $(FAIL)
@cp -r $(OUTPUT_DIR)/tests/ $(IMAGE_TEMP_DIR)/tests || $(FAIL)
@cp ../../../run.sh $(IMAGE_TEMP_DIR) || $(FAIL)
@cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL)
@docker buildx build $(BUILD_ARGS) \
--platform linux/$(ARCH) \
--platform $(IMAGE_PLATFORMS) \
-t $(IMAGE) \
$(IMAGE_TEMP_DIR) || $(FAIL)

Expand Down
Loading