Skip to content
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

PE-3802: Copy UI theme file to rootfs fix #135

Merged
merged 5 commits into from
Feb 21, 2024
Merged

PE-3802: Copy UI theme file to rootfs fix #135

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e39f1a1
fix ui overwrite issue
gabelchinmay Feb 21, 2024
39d43fa
adding ui files directly into root fs
gabelchinmay Feb 21, 2024
ac4ec9c
Revert "adding ui files directly into root fs"
gabelchinmay Feb 21, 2024
5c81cea
testing changes
gabelchinmay Feb 21, 2024
30983e2
fix copy to rootfs
gabelchinmay Feb 21, 2024
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
12 changes: 6 additions & 6 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,6 @@ build-iso:
COPY --if-exists "$CLUSTERCONFIG" /overlay/opt/spectrocloud/clusterconfig/spc.tgz
END

COPY --if-exists ui.tar /overlay/opt/spectrocloud/emc/
RUN if [ -f /overlay/opt/spectrocloud/emc/ui.tar ]; then \
tar -xf /overlay/opt/spectrocloud/emc/ui.tar -C /overlay/opt/spectrocloud/emc && \
rm -f /overlay/opt/spectrocloud/emc/ui.tar; \
fi

WORKDIR /build
COPY --platform=linux/${ARCH} --keep-own +iso-image-rootfs/rootfs /build/image
IF [ "$ARCH" = "arm64" ]
Expand Down Expand Up @@ -366,6 +360,12 @@ iso-image:
FROM --platform=linux/${ARCH} +base-image
COPY --platform=linux/${ARCH} +stylus-image/ /
COPY overlay/files/ /

COPY --if-exists ui.tar /opt/spectrocloud/emc/
RUN if [ -f /opt/spectrocloud/emc/ui.tar ]; then \
tar -xf /opt/spectrocloud/emc/ui.tar -C /opt/spectrocloud/emc && \
rm -f /opt/spectrocloud/emc/ui.tar; \
fi

RUN rm -f /etc/ssh/ssh_host_* /etc/ssh/moduli
RUN touch /etc/machine-id \
Expand Down