mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-11 06:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sign-image): Pull current image from rpm-ostree and fallback to image identifiers

Browse Source 
If offline install media was used, use image identifiers for image signing. Otherwise, pull
the current image information from rpm-ostree.

This addresses issues rebasing from tags other than tags using the Fedora version number.
This commit is contained in:
RJ Trujillo 2023-08-30 15:41:26 -06:00
parent 348832ba28
commit b62722dad7
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
system_files/deck/shared/usr/share/ublue-os/just/custom.just
View File

@ -288,4 +288,31 @@ _toggle_wayland:
sign-image: sign-image:
source /etc/default/bazzite && \ source /etc/default/bazzite && \
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION} if grep -qvz "/var/${IMAGE_VENDOR}/image" <<< $(rpm-ostree status); then \
rpm-ostree rebase ostree-image-signed:$(just --unstable _get-image); \
else \
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION}; \
fi
_get-image:
#!/usr/bin/env python
from json import loads
from subprocess import PIPE, run
"""Pull deployment status via rpm-ostree"""
status = "rpm-ostree status --json"
out = run(status, shell=True, stdout=PIPE).stdout
"""Parse current image"""
deployments = loads(out)["deployments"][0]
current_image = deployments["container-image-reference"].split(":", 1)
"""Dissect current image to form URL to latest image"""
protocol = "docker://"
url = current_image[1]
"""Add protocol if URL doesn't contain it"""
if protocol not in url:
url = protocol + url
print(url)

29
system_files/desktop/shared/usr/share/ublue-os/just/custom.just
View File

@ -195,4 +195,31 @@ unhide-grub:
sign-image: sign-image:
source /etc/default/bazzite && \ source /etc/default/bazzite && \
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION} if grep -qvz "/var/${IMAGE_VENDOR}/image" <<< $(rpm-ostree status); then \
rpm-ostree rebase ostree-image-signed:$(just --unstable _get-image); \
else \
rpm-ostree rebase ostree-image-signed:docker://ghcr.io/${IMAGE_VENDOR}/${IMAGE_NAME}:${FEDORA_MAJOR_VERSION}; \
fi
_get-image:
#!/usr/bin/env python
from json import loads
from subprocess import PIPE, run
"""Pull deployment status via rpm-ostree"""
status = "rpm-ostree status --json"
out = run(status, shell=True, stdout=PIPE).stdout
"""Parse current image"""
deployments = loads(out)["deployments"][0]
current_image = deployments["container-image-reference"].split(":", 1)
"""Dissect current image to form URL to latest image"""
protocol = "docker://"
url = current_image[1]
"""Add protocol if URL doesn't contain it"""
if protocol not in url:
url = protocol + url
print(url)