Streamline and consolidate arch toolbox containerfile

.gitea/workflows/build.yaml

@@ -1,9 +1,9 @@
-name: Gitea Actions Demo
+name: Reese's Arch Toolbox
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+run-name: Build and Push Reese's Arch Toolbox
 on: [push]
 
 jobs:
-  build-arch-toolbox:
+  build-and-push-arch-toolbox:
     runs-on: ubuntu-latest
     if: gitea.ref == 'refs/heads/main'
     steps:

infrastructure/graduated/fedora/Containerfile

@@ -1,26 +1,24 @@
 FROM quay.io/toolbx/arch-toolbox:latest
 
-# Pacman Setup
+# Enable Pacman multilib
-# Enable 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
+    pkgfile \
-
-# Install tools
-RUN pacman -S --noconfirm \
     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
+# AWS CLI V2
-RUN pacman -S --noconfirm unzip
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+    unzip awscliv2.zip && \
-RUN unzip awscliv2.zip
+    ./aws/install && \
-RUN ./aws/install
+    rm awscliv2.zip && \
-
+    rm -rf aws
-# Podman
-RUN pacman -S --noconfirm podman
-
-# Wine
-RUN pacman -Sy --noconfirm wine
 
+####################
 ##### RUN LAST #####
+####################
 
 # ZSHRC
 COPY <<EOF /etc/zsh/zshrc.local

infrastructure/graduated/fedora/fedora-kinoite.md

@@ -28,11 +28,13 @@
     - [Junction](#junction)
     - [Kdenlive](#kdenlive)
     - [The Powder Toy](#the-powder-toy)
+    - [Pika](#pika)
   - [Toolbox](#toolbox)
     - [Reese's Arch Toolbox](#reeses-arch-toolbox)
-      - [Using Reese's Arch Toolbox](#using-reeses-arch-toolbox)
+      - [Pipx/Poetry](#pipxpoetry)
-      - [Updating Reese's Arch Toolbox](#updating-reeses-arch-toolbox)
+    - [Using Reese's Arch Toolbox](#using-reeses-arch-toolbox)
-      - [Building Reese's Arch Toolbox](#building-reeses-arch-toolbox)
+    - [Updating Reese's Arch Toolbox](#updating-reeses-arch-toolbox)
+    - [Building Reese's Arch Toolbox](#building-reeses-arch-toolbox)
 
 ## Podman
 
@@ -287,6 +289,14 @@ I love sandboxes.
 uk.co.powdertoy.tpt
 ```
 
+### Pika
+
+Backup with Borg.
+
+```bash
+flatpak install org.gnome.World.PikaBackup
+```
+
 ## Toolbox
 
 ```bash
@@ -320,14 +330,27 @@ I have a custom arch image based on the default arch-toolbox image. It offers:
 - podman (connected automatically to the host machine via the unix socket)
 - tmux
 
-#### Using Reese's Arch Toolbox
+#### Pipx/Poetry
+
+<https://python-poetry.org/docs/>
+
+```bash
+# pipx is already installed but the pathing won't work for installed apps
+pipx ensurepath # then source ~/.zshrc or ~/.bashrc
+
+pipx install poetry
+# Now this should work.
+poetry new test-project
+```
+
+### Using Reese's Arch Toolbox
 
 ```bash
 toolbox create -i gitea.reeseapps.com/services/arch-toolbox:latest
 SHELL=/bin/zsh toolbox enter arch-toolbox-latest
 ```
 
-#### Updating Reese's Arch Toolbox
+### Updating Reese's Arch Toolbox
 
 ```bash
 # Stop the current arch toolbox
@@ -340,7 +363,7 @@ podman pull gitea.reeseapps.com/services/arch-toolbox:latest
 toolbox create -i gitea.reeseapps.com/services/arch-toolbox:latest
 ```
 
-#### Building Reese's Arch Toolbox
+### Building Reese's Arch Toolbox
 
 You can build and run the image wit this (See `Containerfile` in this directory):