clean up containerfile

johnmmcgee · Oct 1, 2023 · e2f955f · e2f955f
1 parent d8a98a3
commit e2f955f
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/Containerfile b/Containerfile
@@ -70,32 +70,30 @@ RUN dnf install -y \
         zsh
 
 # Set up dependencies
-RUN git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/distrobox && \
-    cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec && \
-    wget https://github.com/1player/host-spawn/releases/download/$(cat /tmp/distrobox/distrobox-host-exec | grep host_spawn_version= | cut -d "\"" -f 2)/host-spawn-$(uname -m) -O /usr/bin/host-spawn && \
-    chmod +x /usr/bin/host-spawn && \
-    rm -drf /tmp/distrobox && \
-    dnf install -y 'dnf-command(copr)'
-
-# Set up cleaner Distrobox integration
-RUN dnf copr enable -y kylegospo/distrobox-utils && \
-    dnf install -y \
-        xdg-utils-distrobox \
-        adw-gtk3-theme && \
-    ln -s /usr/bin/distrobox-host-exec /usr/bin/flatpak
+RUN git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/distrobox
+RUN cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec
+RUN wget https://github.com/1player/host-spawn/releases/download/$(cat /tmp/distrobox/distrobox-host-exec | grep host_spawn_version= | cut -d "\"" -f 2)/host-spawn-$(uname -m) -O /usr/bin/host-spawn
+RUN chmod +x /usr/bin/host-spawn
+RUN rm -drf /tmp/distrobox
+RUN dnf install -y 'dnf-command(copr)'
 
 # Install RPMFusion for hardware accelerated encoding/decoding
 RUN dnf install -y \
         https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
         https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
-    dnf install -y \
+RUN dnf install -y \
         intel-media-driver \
-        nvidia-vaapi-driver && \
-    dnf swap -y mesa-va-drivers mesa-va-drivers-freeworld && \
-    dnf swap -y mesa-vdpau-drivers mesa-vdpau-drivers-freeworld
-
-# cosign
+        nvidia-vaapi-driver
+RUN dnf swap -y mesa-va-drivers mesa-va-drivers-freeworld
+RUN dnf swap -y mesa-vdpau-drivers mesa-vdpau-drivers-freeworld
 
+# Set up cleaner Distrobox integration
+RUN dnf copr enable -y kylegospo/distrobox-utils
+RUN dnf install -y \
+        xdg-utils-distrobox \
+        adw-gtk3-theme && \
+RUN ln -s /usr/bin/distrobox-host-exec /usr/local/bin/flatpak
+RUN ln -s /usr/bin/distrobox-host-exec /usr/local/bin/podman
 
 # Cleanup
 RUN rm -rf /tmp/*