rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-08-15 22:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass targetarch instead of buildarch for copying luet config

Browse Source 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Mauro Morales 2023-08-07 15:58:07 +02:00
parent 518e8f2800
commit 3a34887f19
No known key found for this signature in database
GPG Key ID: 0069994DD7392198
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools-image/Dockerfile
View File

@ -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 COPY --from=luet /usr/bin/luet /usr/bin/luet
ENV LUET_NOLOCK=true ENV LUET_NOLOCK=true
ENV TMPDIR=/tmp ENV TMPDIR=/tmp
ARG BUILDARCH ARG TARGETARCH
# copy both arches # copy both arches
COPY luet-arm64.yaml /tmp/luet-arm64.yaml COPY luet-arm64.yaml /tmp/luet-arm64.yaml
COPY luet-amd64.yaml /tmp/luet-amd64.yaml COPY luet-amd64.yaml /tmp/luet-amd64.yaml
# Set the default luet config to the current build arch # Set the default luet config to the current build arch
RUN mkdir -p /etc/luet/ 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 ## Live CD artifacts
RUN luet install -y livecd/grub2 --system-target /grub2 RUN luet install -y livecd/grub2 --system-target /grub2