From 68122c87cacbadc47bd85403c2d1c5b5b49eab3f Mon Sep 17 00:00:00 2001 From: ER Date: Sun, 2 Apr 2023 11:44:44 +0300 Subject: [PATCH] feat: switch to separate build script --- Containerfile | 12 +++--------- build.sh | 10 ++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 build.sh diff --git a/Containerfile b/Containerfile index 43f9bb1..7387857 100644 --- a/Containerfile +++ b/Containerfile @@ -10,15 +10,9 @@ COPY recipe.yml /etc/ublue-recipe.yml COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq -RUN rpm-ostree override remove firefox firefox-langpacks - -RUN echo "-- Installing RPMs defined in recipe.yml --" && \ - rpm_packages=$(yq '.rpms[]' < /etc/ublue-recipe.yml) && \ - for pkg in $rpm_packages; do \ - echo "Installing: ${pkg}" && \ - rpm-ostree install $pkg; \ - done && \ - echo "---" +# copy and run the build script +COPY build.sh /tmp/build.sh +RUN chmod +x /tmp/build.sh && /tmp/build.sh RUN rm -rf \ /tmp/* \ diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..45bdb84 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +# remove the default firefox (from fedora) in favor of the flatpak +rpm-ostree override remove firefox firefox-langpacks + +echo "-- Installing RPMs defined in recipe.yml --" +rpm_packages=$(yq '.rpms[]' < /etc/ublue-recipe.yml) +for pkg in $rpm_packages; do \ + echo "Installing: ${pkg}" && \ + rpm-ostree install $pkg; \ +done +echo "---" \ No newline at end of file