mirror of
https://github.com/optim-enterprises-bv/secureblue.git
synced 2025-11-07 13:58:03 +00:00
fix: moving recipe back to a directory available on the host (#47)
* fix: mv recipe to a dir available on the host * docs: add notice for recipe editing on host * fix: replace /tmp/ublue-recipe.yml with /usr/etc/.
This commit is contained in:
@@ -18,7 +18,7 @@ RUN mkdir /tmp/scripts
|
||||
COPY scripts /tmp/scripts
|
||||
RUN find /tmp/scripts -type f -exec chmod +x {} \;
|
||||
|
||||
COPY ${RECIPE} /tmp/ublue-recipe.yml
|
||||
COPY ${RECIPE} /usr/etc/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
|
||||
|
||||
6
build.sh
6
build.sh
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
# run scripts
|
||||
echo "-- Running scripts defined in recipe.yml --"
|
||||
buildscripts=$(yq '.scripts[]' < /tmp/ublue-recipe.yml)
|
||||
buildscripts=$(yq '.scripts[]' < /usr/etc/ublue-recipe.yml)
|
||||
for script in $(echo -e "$buildscripts"); do \
|
||||
echo "Running: ${script}" && \
|
||||
/tmp/scripts/$script; \
|
||||
@@ -12,7 +12,7 @@ echo "---"
|
||||
rpm-ostree override remove firefox firefox-langpacks
|
||||
|
||||
echo "-- Installing RPMs defined in recipe.yml --"
|
||||
rpm_packages=$(yq '.rpms[]' < /tmp/ublue-recipe.yml)
|
||||
rpm_packages=$(yq '.rpms[]' < /usr/etc/ublue-recipe.yml)
|
||||
for pkg in $(echo -e "$rpm_packages"); do \
|
||||
echo "Installing: ${pkg}" && \
|
||||
rpm-ostree install $pkg; \
|
||||
@@ -25,7 +25,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"' /usr/etc/yafti.yml
|
||||
yq -i '.screens.applications.values.groups.Custom.default = true' /usr/etc/yafti.yml
|
||||
flatpaks=$(yq '.flatpaks[]' < /tmp/ublue-recipe.yml)
|
||||
flatpaks=$(yq '.flatpaks[]' < /usr/etc/ublue-recipe.yml)
|
||||
for pkg in $(echo -e "$flatpaks"); do \
|
||||
yq -i ".screens.applications.values.groups.Custom.packages += [{\"$pkg\": \"$pkg\"}]" /usr/etc/yafti.yml
|
||||
done
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# Warning: only edit this file inside the images git repository.
|
||||
# If you are looking at this file in your root directory on your computer, editing it does nothing.
|
||||
|
||||
# The image will be at ghcr.io/yourusername/name
|
||||
name: startingpoint
|
||||
|
||||
|
||||
Reference in New Issue
Block a user