chore: Install jq and prefer over yq for modules
This commit is contained in:
parent
81f9024cb3
commit
0de0417515
4 changed files with 15 additions and 4 deletions
|
|
@ -63,7 +63,6 @@
|
|||
rustc
|
||||
bacon
|
||||
earthly
|
||||
yq
|
||||
jq
|
||||
nixpkgs-fmt
|
||||
];
|
||||
|
|
|
|||
9
scripts/pre_build.sh
Normal file
9
scripts/pre_build.sh
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if ! command -v jq > /dev/null; then
|
||||
rpm-ostree install jq
|
||||
fi
|
||||
|
||||
ostree container commit
|
||||
|
|
@ -6,14 +6,14 @@ if [ -f /etc/os-release ]; then
|
|||
if [ "$ID" = "alpine" ]; then
|
||||
echo "Setting up Alpine based image to run BlueBuild modules"
|
||||
apk update
|
||||
apk add --no-cache bash curl coreutils wget grep
|
||||
apk add --no-cache bash curl coreutils wget grep jq
|
||||
elif [ "$ID" = "ubuntu" ] || [ "$ID" = "debian" ]; then
|
||||
echo "Setting up Ubuntu based image to run BlueBuild modules"
|
||||
apt-get update
|
||||
apt-get install -y bash curl coreutils wget
|
||||
apt-get install -y bash curl coreutils wget jq
|
||||
elif [ "$ID" = "fedora" ]; then
|
||||
echo "Settig up Fedora based image to run BlueBuild modules"
|
||||
dnf install -y --refresh bash curl wget coreutils
|
||||
dnf install -y --refresh bash curl wget coreutils jq
|
||||
else
|
||||
echo "OS not detected, proceeding without setup"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -36,6 +36,9 @@ RUN --mount=type=bind,from=stage-bins,src=/bins,dst=/tmp/bins \
|
|||
&& cp /tmp/bins/* /usr/bin/ \
|
||||
&& ostree container commit
|
||||
|
||||
RUN --mount=type=bind,from={{ build_scripts_image }},src=/scripts/,dst=/scripts/ \
|
||||
/scripts/pre_build.sh
|
||||
|
||||
{% call modules::main_modules_run(recipe.modules_ext, os_version) %}
|
||||
|
||||
RUN --mount=type=bind,from={{ build_scripts_image }},src=/scripts/,dst=/scripts/ \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue