Skip to content

Commit 9d922aa

Browse files
authored
fix: bundle correct arch for the mindthegap binary (#954)
**What problem does this PR solve?**: Latest changes broke the published arm build. The `mindthegap` binary from `bundle_builder` will always be `BUILDPLATFORM`, but we want it to match `TARGETPLATFORM`. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent d52de76 commit 9d922aa

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

hack/addons/mindthegap-helm-registry/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@ FROM --platform=${BUILDPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERS
33
# this gets called by goreleaser so the copy source has to be the path relative to the repo root.
44
RUN --mount=source=./hack/addons/mindthegap-helm-registry/repos.yaml,target=/repos.yaml \
55
["/ko-app/mindthegap", "create", "bundle", "--helm-charts-file=/repos.yaml", "--output-file=/tmp/helm-charts.tar"]
6+
7+
FROM --platform=${TARGETPLATFORM} ghcr.io/mesosphere/mindthegap:${MINDTHEGAP_VERSION} as mindthegap
8+
69
FROM --platform=${TARGETPLATFORM} alpine:3.20.3
10+
# Add mindthegap binary that matches TARGETPLATFORM
11+
COPY --from=mindthegap /ko-app/mindthegap /usr/bin/mindthegap
12+
# Add helm charts for the current version
713
ARG VERSION
814
COPY --from=bundle_builder /tmp/helm-charts.tar /charts/helm-charts-${VERSION}.tar
9-
COPY --from=bundle_builder /ko-app/mindthegap /usr/bin/mindthegap
1015
# TODO remove me as soon as its not needed to hold multiple versions of helm charts
1116
COPY --from=ghcr.io/nutanix-cloud-native/caren-helm-reg:v0.14.6 /tmp/helm-charts.tar /charts/helm-charts-v0.14.6.tar
1217
COPY --from=ghcr.io/nutanix-cloud-native/caren-helm-reg:v0.14.9 /tmp/helm-charts.tar /charts/helm-charts-v0.14.9.tar

0 commit comments

Comments
 (0)