Skip to content

Commit

Permalink
fix: Actually include Flathub on the installed system
Browse files Browse the repository at this point in the history
  • Loading branch information
EyeCantCU committed Aug 1, 2023
1 parent 2bd33b2 commit 1d2f63d
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ RUN if grep -v "nvidia" <<< "${IMAGE_NAME}"; then \
rpm-ostree install \
rocm-hip \
rocm-opencl \
; fi

# Add Flathub
RUN flatpak remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
flatpak remote-modify --system flathub --no-filter --title="Flathub (System)"
; fi

# Cleanup & Finalize
RUN rm /usr/share/applications/shredder.desktop && \
Expand All @@ -100,6 +96,8 @@ RUN rm /usr/share/applications/shredder.desktop && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
flatpak remove --system --noninteractive --all && \
mkdir -p /etc/flatpak/remotes.d && \
wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /etc/flatpak/remotes.d && \
cat /etc/flatpak/install | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
systemctl unmask flatpak-system-install.service && \
systemctl enable flatpak-system-install.service && \
Expand Down Expand Up @@ -185,10 +183,6 @@ RUN rpm-ostree install \
git clone https://gitlab.com/evlaV/jupiter-dock-updater-bin.git --depth 1 /tmp/jupiter-dock-updater-bin && \
mv -v /tmp/jupiter-dock-updater-bin/packaged/usr/lib/jupiter-dock-updater /usr/lib/jupiter-dock-updater

# Add Flathub
RUN flatpak remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
flatpak remote-modify --system flathub --no-filter --title="Flathub (System)"

# Cleanup & Finalize
RUN rm /usr/share/applications/winetricks.desktop && \
ln -s /usr/bin/steamos-logger /usr/bin/steamos-info && \
Expand Down

0 comments on commit 1d2f63d

Please sign in to comment.