From 4d24970e04f374c58c7f45914f650dea8e5f511c Mon Sep 17 00:00:00 2001
From: ducoterra <git@ducoterra.net>
Date: Tue, 26 Nov 2024 19:50:45 -0500
Subject: [PATCH] fix build issue with cache causing pacman problems

---
 .gitea/workflows/build.yaml                       |  1 +
 README.md                                         |  4 ++++
 infrastructure/graduated/fedora/Containerfile     | 15 ++++++++++-----
 infrastructure/graduated/fedora/arch-build.sh     |  7 ++++---
 infrastructure/graduated/fedora/arch-push.sh      |  6 ------
 infrastructure/graduated/fedora/fedora-kinoite.md | 12 +-----------
 6 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100755 infrastructure/graduated/fedora/arch-push.sh

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 94c34e8..23a73a0 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -22,3 +22,4 @@ jobs:
           file: ${{ gitea.workspace }}/infrastructure/graduated/fedora/Containerfile
           push: true
           tags: "gitea.reeseapps.com/services/arch-toolbox:latest,gitea.reeseapps.com/services/arch-toolbox:${{gitea.sha}}"
+          no-cache: true
\ No newline at end of file
diff --git a/README.md b/README.md
index efe0e1f..b0aecb4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # Homelab
 
+Reese's Arch Toolbox Status:
+
+![Arch Toolbox Status](https://gitea.reeseapps.com/services/homelab/actions/workflows/build.yaml/badge.svg?branch=main)
+
 A project to store homelab stuff.
 
 ## Table of Contents
diff --git a/infrastructure/graduated/fedora/Containerfile b/infrastructure/graduated/fedora/Containerfile
index ce41253..0fede25 100644
--- a/infrastructure/graduated/fedora/Containerfile
+++ b/infrastructure/graduated/fedora/Containerfile
@@ -1,5 +1,14 @@
 FROM quay.io/toolbx/arch-toolbox:latest
 
+# Pacman Setup
+# 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.
+RUN sed -i 's/Architecture = auto/Architecture = x86_64/' /etc/pacman.conf
+# Get updates
 RUN pacman -Syu --noconfirm
 
 # Install zsh
@@ -38,11 +47,7 @@ RUN ./aws/install
 RUN pacman -S --noconfirm podman
 
 # Wine
-COPY <<EOF /etc/pacman.conf
-[multilib]
-Include = /etc/pacman.d/mirrorlist
-EOF
-RUN pacman -Syu --noconfirm wine
+RUN pacman -Sy --noconfirm wine
 
 ##### RUN LAST #####
 
diff --git a/infrastructure/graduated/fedora/arch-build.sh b/infrastructure/graduated/fedora/arch-build.sh
index 1a52a42..a2e18ae 100755
--- a/infrastructure/graduated/fedora/arch-build.sh
+++ b/infrastructure/graduated/fedora/arch-build.sh
@@ -2,9 +2,10 @@
 
 # Build latest image
 podman build \
-    -t gitea.reeseapps.com/services/arch-toolbox:latest \
-    -t gitea.reeseapps.com/services/arch-toolbox:$(date +%s) \
-    -f ./infrastructure/graduated/fedora/Containerfile
+  --no-cache \
+  -t gitea.reeseapps.com/services/arch-toolbox:latest \
+  -t gitea.reeseapps.com/services/arch-toolbox:$(date +%s) \
+  -f ./infrastructure/graduated/fedora/Containerfile
 # Stop the current arch toolbox
 podman container stop arch-toolbox-latest
 # Remove the old container
diff --git a/infrastructure/graduated/fedora/arch-push.sh b/infrastructure/graduated/fedora/arch-push.sh
deleted file mode 100755
index 3ea94b4..0000000
--- a/infrastructure/graduated/fedora/arch-push.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-podman image ls \
-    -f 'reference=gitea.reeseapps.com/services/arch-toolbox:latest' \
-    -n --no-trunc --format '{{ .Repository }}:{{ .Tag }}' \
-    | xargs -I {} podman push {}
\ No newline at end of file
diff --git a/infrastructure/graduated/fedora/fedora-kinoite.md b/infrastructure/graduated/fedora/fedora-kinoite.md
index 28801e2..54ed606 100644
--- a/infrastructure/graduated/fedora/fedora-kinoite.md
+++ b/infrastructure/graduated/fedora/fedora-kinoite.md
@@ -347,8 +347,8 @@ You can build and run the image wit this (See `Containerfile` in this directory)
 ```bash
 # Build latest image
 podman build \
+    --no-cache \
     -t gitea.reeseapps.com/services/arch-toolbox:latest \
-    -t gitea.reeseapps.com/services/arch-toolbox:$(date +%s) \
     -f ./infrastructure/graduated/fedora/Containerfile
 
 # Test with podman
@@ -363,16 +363,6 @@ toolbox create -i gitea.reeseapps.com/services/arch-toolbox:latest
 SHELL=/bin/zsh toolbox enter
 ```
 
-You can push the image up to your registry like normal:
-
-```bash
-# Push all tags for the "latest" image
-podman image ls \
-    -f 'reference=gitea.reeseapps.com/services/arch-toolbox:latest' \
-    -n --no-trunc --format '{{ .Repository }}:{{ .Tag }}' \
-    | xargs -I {} podman push {}
-```
-
 In vscode you can set this as your default build task for homelab and trigger it with
 `ctrl shift B`