Skip to content

Commit

Permalink
Merge pull request #84 from kairos-io/pass-targetarch-instead-of-buil…
Browse files Browse the repository at this point in the history
…darch

Pass targetarch instead of buildarch for copying luet config
  • Loading branch information
mauromorales authored Aug 7, 2023
2 parents 518e8f2 + 3a34887 commit a549b5e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ RUN zypper ref && zypper in -y bc qemu-tools jq cdrtools docker git curl gptfdis
COPY --from=luet /usr/bin/luet /usr/bin/luet
ENV LUET_NOLOCK=true
ENV TMPDIR=/tmp
ARG BUILDARCH
ARG TARGETARCH
# copy both arches
COPY luet-arm64.yaml /tmp/luet-arm64.yaml
COPY luet-amd64.yaml /tmp/luet-amd64.yaml
# Set the default luet config to the current build arch
RUN mkdir -p /etc/luet/
RUN cp /tmp/luet-${BUILDARCH}.yaml /etc/luet/luet.yaml
RUN cp /tmp/luet-${TARGETARCH}.yaml /etc/luet/luet.yaml

## Live CD artifacts
RUN luet install -y livecd/grub2 --system-target /grub2
Expand Down

0 comments on commit a549b5e

Please sign in to comment.