mirror of
https://github.com/optim-enterprises-bv/secureblue.git
synced 2025-11-07 13:58:03 +00:00
chore: put ublue-recipe in /tmp
-> there's no reason to send the recipe to the client as it is only used in the build stages
This commit is contained in:
@@ -7,7 +7,7 @@ FROM ghcr.io/ublue-os/silverblue-main:${FEDORA_MAJOR_VERSION}
|
||||
COPY etc /etc
|
||||
# COPY usr /usr
|
||||
|
||||
COPY recipe.yml /etc/ublue-recipe.yml
|
||||
COPY recipe.yml /tmp/ublue-recipe.yml
|
||||
|
||||
# yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml
|
||||
# copied from the official container image as it's not avaible as an rpm
|
||||
|
||||
4
build.sh
4
build.sh
@@ -3,7 +3,7 @@
|
||||
rpm-ostree override remove firefox firefox-langpacks
|
||||
|
||||
echo "-- Installing RPMs defined in recipe.yml --"
|
||||
rpm_packages=$(yq '.rpms[]' < /etc/ublue-recipe.yml)
|
||||
rpm_packages=$(yq '.rpms[]' < /tmp/ublue-recipe.yml)
|
||||
for pkg in $(echo -e "$rpm_packages"); do \
|
||||
echo "Installing: ${pkg}" && \
|
||||
rpm-ostree install $pkg; \
|
||||
@@ -16,7 +16,7 @@ pip install --prefix=/usr yafti
|
||||
# add a package group for yafti using the packages defined in recipe.yml
|
||||
yq -i '.screens.applications.values.groups.Custom.description = "Flatpaks defined by the image maintainer"' /etc/yafti.yml
|
||||
yq -i '.screens.applications.values.groups.Custom.default = true' /etc/yafti.yml
|
||||
flatpaks=$(yq '.flatpaks[]' < /etc/ublue-recipe.yml)
|
||||
flatpaks=$(yq '.flatpaks[]' < /tmp/ublue-recipe.yml)
|
||||
for pkg in $(echo -e "$flatpaks"); do \
|
||||
yq -i ".screens.applications.values.groups.Custom.packages += [{\"$pkg\": \"$pkg\"}]" /etc/yafti.yml
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user