chore: modify arch, merge google chrome toolbox with ubuntu toolbox f…

…iles

.github/workflows/build-google-chrome-toolbox.yml

@@ -65,7 +65,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: |
-            ./toolboxes/google-chrome-toolbox/Containerfile.google-chrome
+            ./toolboxes/ubuntu-toolbox/Containerfile.google-chrome
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ env.IMAGE_TAGS }}
           labels: ${{ steps.meta.outputs.labels }}

toolboxes/arch-toolbox/Containerfile.arch

@@ -1,8 +1,10 @@
 FROM ghcr.io/ublue-os/arch-distrobox AS arch-toolbox
+# Based on bazzite-arch with minor modifications
 
 COPY toolboxes/arch-toolbox/files /
 
-# Install needed packages
+# Install gaming related packages
+# Steam seperated to prevent it from installing its own dependecies
 RUN pacman -Syu \
         lib32-vulkan-radeon \
         libva-mesa-driver \
@@ -21,10 +23,7 @@ RUN pacman -Syu \
         lib32-libpulse \
         lib32-openal \
         xdg-desktop-portal-kde \
-        vim \
         nano \
-        hyfetch \
-        fish \
         yad \
         xdg-user-dirs \
         xdotool \
@@ -45,7 +44,6 @@ RUN pacman -Syu \
         wget https://raw.githubusercontent.com/Shringe/LatencyFleX-Installer/main/install.sh -O /usr/bin/latencyflex && \
         sed -i 's@"dxvk.conf"@"/usr/share/latencyflex/dxvk.conf"@g' /usr/bin/latencyflex && \
         chmod +x /usr/bin/latencyflex
-        # Steam/Lutris/Wine installed separately so they use the dependencies above and don't try to install their own.
 
 # Create build user
 RUN useradd -m --shell=/bin/bash build && usermod -L build && \
@@ -59,19 +57,14 @@ RUN paru -Syu \
         aur/protontricks \
         aur/vkbasalt \
         aur/lib32-vkbasalt \
-        aur/obs-vkcapture-git \
-        aur/lib32-obs-vkcapture-git \
         aur/lib32-gperftools \
         aur/steamcmd \
         --noconfirm
 USER root
 WORKDIR /
 
 # Cleanup
-# Native march & tune. This is a gaming image and not something a user is going to compile things in with the intent to share.
-# We do this last because it'll only apply to updates the user makes going forward. We don't want to optimize for the build host's environment.
 RUN sed -i 's@ (Runtime)@@g' /usr/share/applications/steam.desktop && \
-    sed -i 's/-march=x86-64 -mtune=generic/-march=native -mtune=native/g' /etc/makepkg.conf && \
     userdel -r build && \
     rm -drf /home/build && \
     sed -i '/build ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \

toolboxes/arch-toolbox/Containerfile.arch-gnome

@@ -2,7 +2,7 @@ FROM ghcr.io/ublue-os/arch-distrobox AS arch-gnome-toolbox
 
 COPY toolboxes/arch-toolbox/files /
 
-# Install needed packages
+# Install gaming related packages
 RUN pacman -Syu \
         lib32-vulkan-radeon \
         libva-mesa-driver \
@@ -22,10 +22,7 @@ RUN pacman -Syu \
         lib32-openal \
         xdg-desktop-portal-gtk \
         xdg-desktop-portal-gnome \
-        vim \
         nano \
-        hyfetch \
-        fish \
         yad \
         xdg-user-dirs \
         xdotool \
@@ -60,19 +57,14 @@ RUN paru -Syu \
         aur/protontricks \
         aur/vkbasalt \
         aur/lib32-vkbasalt \
-        aur/obs-vkcapture-git \
-        aur/lib32-obs-vkcapture-git \
         aur/lib32-gperftools \
         aur/steamcmd \
         --noconfirm
 USER root
 WORKDIR /
 
 # Cleanup
-# Native march & tune. This is a gaming image and not something a user is going to compile things in with the intent to share.
-# We do this last because it'll only apply to updates the user makes going forward. We don't want to optimize for the build host's environment.
 RUN sed -i 's@ (Runtime)@@g' /usr/share/applications/steam.desktop && \
-    sed -i 's/-march=x86-64 -mtune=generic/-march=native -mtune=native/g' /etc/makepkg.conf && \
     userdel -r build && \
     rm -drf /home/build && \
     sed -i '/build ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \

toolboxes/ubuntu-toolbox/Containerfile.ubuntu

@@ -1,8 +1,9 @@
 FROM quay.io/toolbx-images/ubuntu-toolbox:22.04
 # From https://github.com/toolbx-images/images/tree/main/ubuntu/22.04
 
-COPY ./toolboxes/ubuntu-toolbox/packages.ubuntu /toolbox-packages
+COPY ./toolboxes/ubuntu-toolbox/basic.ubuntu /toolbox-packages
 
+# Installs basic packages listed in the basic.ubuntu file
 RUN apt-get update && \ 
     apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install \