Streamline and consolidate arch toolbox containerfile

infrastructure/graduated/fedora/Containerfile

@@ -1,26 +1,24 @@
 FROM quay.io/toolbx/arch-toolbox:latest
 
-# Pacman Setup
-# Enable multilib
+# Enable Pacman multilib
 RUN tee -a /etc/pacman.conf <<EOF
 [multilib]
 Include = /etc/pacman.d/mirrorlist
 EOF
-# Set architecture to x86_64 manually because auto doesn't work.
+
+# Set Pacman architecture to x86_64 manually because auto doesn't work.
 RUN sed -i 's/Architecture = auto/Architecture = x86_64/' /etc/pacman.conf
-# Get updates
+
+# Sync Pacman repos and get updates
 RUN pacman -Syu --noconfirm
 
-# Install zsh
+# Install tools
 RUN pacman -S --noconfirm \
     zsh \
     grml-zsh-config \
     zsh-syntax-highlighting \
     zsh-autosuggestions \
-    pkgfile
-
-# Install tools
-RUN pacman -S --noconfirm \
+    pkgfile \
     vim \
     bind \
     iperf3 \
@@ -32,24 +30,26 @@ RUN pacman -S --noconfirm \
     python-pipx \
     ansible \
     tmux \
-    ffmpeg
+    ffmpeg \
+    wine \
+    podman \
+    unzip
 
 # Ollama
-RUN curl -fsSL https://ollama.com/install.sh | sh
+RUN curl -L https://ollama.com/download/ollama-linux-amd64.tgz -o ollama-linux-amd64.tgz && \
+    tar -C /usr -xzf ollama-linux-amd64.tgz && \
+    rm ollama-linux-amd64.tgz
 
-# AWS CLI
-RUN pacman -S --noconfirm unzip
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-RUN unzip awscliv2.zip
-RUN ./aws/install
-
-# Podman
-RUN pacman -S --noconfirm podman
-
-# Wine
-RUN pacman -Sy --noconfirm wine
+# AWS CLI V2
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm awscliv2.zip && \
+    rm -rf aws
 
+####################
 ##### RUN LAST #####
+####################
 
 # ZSHRC
 COPY <<EOF /etc/zsh/zshrc.local