mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-04-01 04:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add image info for auto-signing via ublue-update

Browse Source 
We use image-info.sh to generate information about the given image at
the time it's built. This replaces our current implementation of
sourcing identifiers written to /etc/default/bazzite
This commit is contained in:
RJ Trujillo 2023-09-22 11:19:14 -06:00
parent 772bd4cd9f
commit a30a8f924a
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Containerfile
View File

@ -14,6 +14,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
COPY system_files/desktop/shared / COPY system_files/desktop/shared /
COPY system_files/desktop/${BASE_IMAGE_NAME} / COPY system_files/desktop/${BASE_IMAGE_NAME} /
COPY image-info.sh /tmp/image-info.sh
# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion # Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
@ -159,7 +160,8 @@ RUN if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
; fi ; fi
# Cleanup & Finalize # Cleanup & Finalize
RUN rm /usr/share/applications/shredder.desktop && \ RUN /tmp/image-info.sh && \
rm /usr/share/applications/shredder.desktop && \
rm /usr/share/vulkan/icd.d/lvp_icd.*.json && \ rm /usr/share/vulkan/icd.d/lvp_icd.*.json && \
mkdir -p "/usr/etc/profile.d/" && \ mkdir -p "/usr/etc/profile.d/" && \
ln -s "/usr/share/ublue-os/firstboot/launcher/login-profile.sh" \ ln -s "/usr/share/ublue-os/firstboot/launcher/login-profile.sh" \
@ -211,7 +213,6 @@ RUN rm /usr/share/applications/shredder.desktop && \
rm /usr/share/wayland-sessions/weston.desktop \ rm /usr/share/wayland-sessions/weston.desktop \
; fi && \ ; fi && \
mkdir -p /usr/etc/default && \ mkdir -p /usr/etc/default && \
echo -e "IMAGE_NAME=${IMAGE_NAME}\nIMAGE_VENDOR=${IMAGE_VENDOR}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /usr/etc/default/bazzite && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \
/var/* && \ /var/* && \
@ -229,6 +230,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
COPY system_files/deck/shared / COPY system_files/deck/shared /
COPY system_files/deck/${BASE_IMAGE_NAME} / COPY system_files/deck/${BASE_IMAGE_NAME} /
COPY image-info.sh /tmp/image-info.sh
# Setup Copr repos # Setup Copr repos
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \
@ -385,7 +387,8 @@ RUN rpm-ostree install \
; fi ; fi
# Cleanup & Finalize # Cleanup & Finalize
RUN rm /usr/share/applications/wine*.desktop && \ RUN /tmp/image-info.sh && \
rm /usr/share/applications/wine*.desktop && \
ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \ ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \
ln -s /usr/bin/steamos-logger /usr/bin/steamos-notice && \ ln -s /usr/bin/steamos-logger /usr/bin/steamos-notice && \
ln -s /usr/bin/steamos-logger /usr/bin/steamos-warning && \ ln -s /usr/bin/steamos-logger /usr/bin/steamos-warning && \
@ -430,7 +433,6 @@ RUN rm /usr/share/applications/wine*.desktop && \
systemctl disable ublue-update.timer && \ systemctl disable ublue-update.timer && \
rm -f /usr/etc/sddm.conf && \ rm -f /usr/etc/sddm.conf && \
rm -f /usr/etc/default/bazzite && \ rm -f /usr/etc/default/bazzite && \
echo -e "IMAGE_NAME=${IMAGE_NAME}\nIMAGE_VENDOR=${IMAGE_VENDOR}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /usr/etc/default/bazzite && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \
/var/* && \ /var/* && \

26
image-info.sh Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env bash
set -oue pipefail
IMAGE_REF="docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
case $FEDORA_MAJOR_VERSION in
38)
IMAGE_TAG="latest"
;;
*)
IMAGE_TAG="$FEDORA_MAJOR_VERSION"
;;
esac
{
echo "{"
echo '"image-name": "'"$IMAGE_NAME"'",'
echo '"image-flavor": "'"$IMAGE_FLAVOR"'",'
echo '"image-vendor": "'"$IMAGE_VENDOR"'",'
echo '"image-ref": "'"$IMAGE_REF"'",'
echo '"image-tag":"'"$IMAGE_TAG"'",'
echo '"base-image-name": "'"$BASE_IMAGE_NAME"'",'
echo '"fedora-version": "'"$FEDORA_MAJOR_VERSION"'"'
echo "}"
} > "/usr/share/ublue-os/image-info.json"