From 5ec9e555f8241214333cc28ec697033ae56dc52f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 27 Jul 2024 22:08:49 -0700 Subject: [PATCH] fix: Remove pip installed packages and use newly made rpm packages, fixes python errors when layering some packages. --- Containerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index dbc2f3b98b..57f00777b2 100644 --- a/Containerfile +++ b/Containerfile @@ -376,9 +376,8 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ cockpit-navigator \ cockpit-storaged \ ydotool \ - lsb_release && \ - pip install --prefix=/usr topgrade && \ - rpm-ostree install \ + lsb_release \ + yafti \ ublue-update && \ mkdir -p /usr/etc/xdg/autostart && \ sed -i '1s/^/[include]\npaths = ["\/etc\/ublue-os\/topgrade.toml"]\n\n/' /usr/share/ublue-update/topgrade-user.toml && \ @@ -624,7 +623,6 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ echo "import \"/usr/share/ublue-os/just/84-bazzite-virt.just\"" >> /usr/share/ublue-os/justfile && \ echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \ echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \ - pip install --prefix=/usr yafti && \ sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \