feat: switch to separate build script
This commit is contained in:
@@ -10,15 +10,9 @@ COPY recipe.yml /etc/ublue-recipe.yml
|
|||||||
|
|
||||||
COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
|
COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
|
||||||
|
|
||||||
RUN rpm-ostree override remove firefox firefox-langpacks
|
# copy and run the build script
|
||||||
|
COPY build.sh /tmp/build.sh
|
||||||
RUN echo "-- Installing RPMs defined in recipe.yml --" && \
|
RUN chmod +x /tmp/build.sh && /tmp/build.sh
|
||||||
rpm_packages=$(yq '.rpms[]' < /etc/ublue-recipe.yml) && \
|
|
||||||
for pkg in $rpm_packages; do \
|
|
||||||
echo "Installing: ${pkg}" && \
|
|
||||||
rpm-ostree install $pkg; \
|
|
||||||
done && \
|
|
||||||
echo "---"
|
|
||||||
|
|
||||||
RUN rm -rf \
|
RUN rm -rf \
|
||||||
/tmp/* \
|
/tmp/* \
|
||||||
|
|||||||
10
build.sh
Normal file
10
build.sh
Normal file
@@ -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 "---"
|
||||||
Reference in New Issue
Block a user