scottk/secureblue
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/secureblue.git synced 2025-11-07 13:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: moving recipe back to a directory available on the host (#47)

Browse Source 
* 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:
Eino Rauhala
2023-04-26 19:19:31 +03:00
committed by GitHub
parent ec91345bc7
commit 95ff830b49
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Containerfile
View File

@@ -18,7 +18,7 @@ RUN mkdir /tmp/scripts
COPY scripts /tmp/scripts COPY scripts /tmp/scripts
RUN find /tmp/scripts -type f -exec chmod +x {} \; 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 # 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 # copied from the official container image as it's not avaible as an rpm

6
build.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# run scripts # run scripts
echo "-- Running scripts defined in recipe.yml --" 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 \ for script in $(echo -e "$buildscripts"); do \
echo "Running: ${script}" && \ echo "Running: ${script}" && \
/tmp/scripts/$script; \ /tmp/scripts/$script; \
@@ -12,7 +12,7 @@ echo "---"
rpm-ostree override remove firefox firefox-langpacks rpm-ostree override remove firefox firefox-langpacks
echo "-- Installing RPMs defined in recipe.yml --" 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 \ for pkg in $(echo -e "$rpm_packages"); do \
echo "Installing: ${pkg}" && \ echo "Installing: ${pkg}" && \
rpm-ostree install $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 # 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.description = "Flatpaks defined by the image maintainer"' /usr/etc/yafti.yml
yq -i '.screens.applications.values.groups.Custom.default = true' /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 \ for pkg in $(echo -e "$flatpaks"); do \
yq -i ".screens.applications.values.groups.Custom.packages += [{\"$pkg\": \"$pkg\"}]" /usr/etc/yafti.yml yq -i ".screens.applications.values.groups.Custom.packages += [{\"$pkg\": \"$pkg\"}]" /usr/etc/yafti.yml
done done

3
recipe.yml
View File

@@ -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 # The image will be at ghcr.io/yourusername/name
name: startingpoint name: startingpoint