From c0a220cebeccf1efc416223bde37a55efbf0ce5a Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Wed, 22 Oct 2025 20:51:57 -0700
Subject: [PATCH] Fix build process not being able to see packages.

---
 Config/ProvisionTests/Dockerfiles/arch           |  8 +++++++-
 Config/ProvisionTests/Dockerfiles/debian         |  8 +++++++-
 Config/ProvisionTests/Dockerfiles/fedora         |  8 +++++++-
 Config/ProvisionTests/Dockerfiles/opensuse       | 10 +++++++---
 Config/ProvisionTests/Dockerfiles/ubuntu         |  8 +++++++-
 Config/ProvisionTests/docker-compose.example.yml | 15 +++++++++++++++
 Config/ProvisionTests/example.env                | 10 +++++-----
 7 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/Config/ProvisionTests/Dockerfiles/arch b/Config/ProvisionTests/Dockerfiles/arch
index 3a0cc8a..3bd8298 100644
--- a/Config/ProvisionTests/Dockerfiles/arch
+++ b/Config/ProvisionTests/Dockerfiles/arch
@@ -2,7 +2,13 @@
 
 FROM archlinux:base
 
-RUN pacman -Syu --noconfirm && pacman -Sy --noconfirm $PACKAGES $EXTRA_ARCH
+ARG PACKAGES
+ENV PACKAGES="$PACKAGES"
+ARG EXTRA_ARCH
+ENV EXTRA_ARCH="$EXTRA_ARCH"
+
+#RUN pacman -Syu --noconfirm
+RUN pacman -Sy  --noconfirm $PACKAGES $EXTRA_ARCH
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh
diff --git a/Config/ProvisionTests/Dockerfiles/debian b/Config/ProvisionTests/Dockerfiles/debian
index d263f58..73d65d2 100644
--- a/Config/ProvisionTests/Dockerfiles/debian
+++ b/Config/ProvisionTests/Dockerfiles/debian
@@ -2,7 +2,13 @@
 
 FROM debian:trixie
 
-RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_DEBIAN
+ARG PACKAGES
+ENV PACKAGES="$PACKAGES"
+ARG EXTRA_DEBIAN
+ENV EXTRA_DEBIAN="$EXTRA_DEBIAN"
+
+#RUN apt update && apt dist-upgrade -y
+RUN apt update && apt install -y $PACKAGES $EXTRA_DEBIAN
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh
diff --git a/Config/ProvisionTests/Dockerfiles/fedora b/Config/ProvisionTests/Dockerfiles/fedora
index 5bacd24..a0655af 100644
--- a/Config/ProvisionTests/Dockerfiles/fedora
+++ b/Config/ProvisionTests/Dockerfiles/fedora
@@ -2,7 +2,13 @@
 
 FROM fedora:latest
 
-RUN dnf upgrade --refresh -y && dnf install -y $PACKAGES $EXTRA_FEDORA
+ARG PACKAGES
+ENV PACKAGES="$PACKAGES"
+ARG EXTRA_FEDORA
+ENV EXTRA_FEDORA="$EXTRA_FEDORA"
+
+#RUN dnf upgrade --refresh -y
+RUN dnf install --refresh -y $PACKAGES $EXTRA_FEDORA
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh
diff --git a/Config/ProvisionTests/Dockerfiles/opensuse b/Config/ProvisionTests/Dockerfiles/opensuse
index 45296b2..a41c21f 100644
--- a/Config/ProvisionTests/Dockerfiles/opensuse
+++ b/Config/ProvisionTests/Dockerfiles/opensuse
@@ -2,9 +2,13 @@
 
 FROM opensuse/tumbleweed
 
-RUN zypper -n refresh \
-   && zypper -n dist-upgrade -y \
-   && zypper -n install -y $PACKAGES $EXTRA_OPENSUSE
+ARG PACKAGES
+ENV PACKAGES="$PACKAGES"
+ARG EXTRA_OPENSUSE
+ENV EXTRA_OPENSUSE="$EXTRA_OPENSUSE"
+
+#RUN zypper -n refresh && zypper -n dist-upgrade -y
+RUN zypper -n refresh && zypper -n install -y $PACKAGES $EXTRA_OPENSUSE
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh
diff --git a/Config/ProvisionTests/Dockerfiles/ubuntu b/Config/ProvisionTests/Dockerfiles/ubuntu
index 235ea51..f4ab326 100644
--- a/Config/ProvisionTests/Dockerfiles/ubuntu
+++ b/Config/ProvisionTests/Dockerfiles/ubuntu
@@ -2,7 +2,13 @@
 
 FROM ubuntu:rolling
 
-RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_UBUNTU
+ARG PACKAGES
+ENV PACKAGES="$PACKAGES"
+ARG EXTRA_UBUNTU
+ENV EXTRA_UBUNTU="$EXTRA_UBUNTU"
+
+#RUN apt update && apt dist-upgrade -y
+RUN apt update && apt install -y $PACKAGES $EXTRA_UBUNTU
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh
diff --git a/Config/ProvisionTests/docker-compose.example.yml b/Config/ProvisionTests/docker-compose.example.yml
index 4f59f61..c440ac4 100644
--- a/Config/ProvisionTests/docker-compose.example.yml
+++ b/Config/ProvisionTests/docker-compose.example.yml
@@ -17,6 +17,9 @@ services:
       context: ./
       dockerfile: Dockerfiles/arch
       network: host
+      args:
+        PACKAGES: ${PACKAGES}
+        EXTRA_ARCH: ${EXTRA_ARCH}
     restart: no
     environment:
       - PACKAGES=$PACKAGES
@@ -43,6 +46,9 @@ services:
       context: ./
       dockerfile: Dockerfiles/debian
       network: host
+      args:
+        PACKAGES: ${PACKAGES}
+        EXTRA_DEBIAN: ${EXTRA_DEBIAN}
     restart: no
     environment:
       - PACKAGES=$PACKAGES
@@ -69,6 +75,9 @@ services:
       context: ./
       dockerfile: Dockerfiles/fedora
       network: host
+      args:
+        PACKAGES: ${PACKAGES}
+        EXTRA_FEDORA: ${EXTRA_FEDORA}
     restart: no
     environment:
       - PACKAGES=$PACKAGES
@@ -95,6 +104,9 @@ services:
       context: ./
       dockerfile: Dockerfiles/opensuse
       network: host
+      args:
+        PACKAGES: ${PACKAGES}
+        EXTRA_OPENSUSE: ${EXTRA_OPENSUSE}
     restart: no
     environment:
       - PACKAGES=$PACKAGES
@@ -121,6 +133,9 @@ services:
       context: ./
       dockerfile: Dockerfiles/ubuntu
       network: host
+      args:
+        PACKAGES: ${PACKAGES}
+        EXTRA_UBUNTU: ${EXTRA_UBUNTU}
     restart: no
     environment:
       - PACKAGES=$PACKAGES
diff --git a/Config/ProvisionTests/example.env b/Config/ProvisionTests/example.env
index aaf8041..79f22e0 100644
--- a/Config/ProvisionTests/example.env
+++ b/Config/ProvisionTests/example.env
@@ -12,11 +12,11 @@ PT_STORAGE_DIR=/tmp/ProvisionTests
 
 ## Packages
 PACKAGES="git bash curl sudo which"
-EXTRA_ARCH=""
-EXTRA_DEBIAN=""
-EXTRA_FEDORA=""
-EXTRA_OPENSUSE=""
-EXTRA_UBUNTU=""
+EXTRA_ARCH="htop"
+EXTRA_DEBIAN="htop"
+EXTRA_FEDORA="htop"
+EXTRA_OPENSUSE="htop"
+EXTRA_UBUNTU="htop"
 
 ## Script
 REPO=https://git.hyperling.com/me/env-ansible