Move packages to env file and allow extras per distro.

Config/ProvisionTests/Dockerfiles/arch

@@ -2,7 +2,7 @@
 
 FROM archlinux:base
 
-RUN pacman -Syu --noconfirm && pacman -Sy --noconfirm git bash curl sudo which
+RUN pacman -Syu --noconfirm && pacman -Sy --noconfirm $PACKAGES $EXTRA_ARCH
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh

Config/ProvisionTests/Dockerfiles/debian

@@ -2,7 +2,7 @@
 
 FROM debian:trixie
 
-RUN apt update && apt dist-upgrade -y && apt install -y git bash curl sudo which
+RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_DEBIAN
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh

Config/ProvisionTests/Dockerfiles/fedora

@@ -2,7 +2,7 @@
 
 FROM fedora:latest
 
-RUN dnf upgrade --refresh -y && dnf install -y git bash curl sudo which
+RUN dnf upgrade --refresh -y && dnf install -y $PACKAGES $EXTRA_FEDORA
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh

Config/ProvisionTests/Dockerfiles/opensuse

@@ -4,7 +4,7 @@ FROM opensuse/tumbleweed
 
 RUN zypper -n refresh \
    && zypper -n dist-upgrade -y \
-   && zypper -n install -y git bash curl sudo which
+   && zypper -n install -y $PACKAGES $EXTRA_OPENSUSE
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh

Config/ProvisionTests/Dockerfiles/ubuntu

@@ -2,7 +2,7 @@
 
 FROM ubuntu:rolling
 
-RUN apt update && apt dist-upgrade -y && apt install -y git bash curl sudo which
+RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_UBUNTU
 
 COPY bin/main.sh /root/main.sh
 RUN chmod +x /root/main.sh

Config/ProvisionTests/docker-compose.standard.yml

@@ -19,6 +19,8 @@ services:
       network: host
     restart: no
     environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_ARCH=$EXTRA_ARCH
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
@@ -35,7 +37,6 @@ services:
           cpus: $CPU
           memory: $RAM
 
-
   pt-debian:
     container_name: pt-debian
     build:
@@ -44,6 +45,8 @@ services:
       network: host
     restart: no
     environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_DEBIAN=$EXTRA_DEBIAN
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
@@ -60,32 +63,6 @@ services:
           cpus: $CPU
           memory: $RAM
 
-
-  pt-ubuntu:
-    container_name: pt-ubuntu
-    build:
-      context: ./
-      dockerfile: Dockerfiles/ubuntu
-      network: host
-    restart: no
-    environment:
-      - REPO=$REPO
-      - BRANCH=$BRANCH
-      - EXEC=$EXEC
-    volumes:
-      - type: volume
-        source: pt-storage
-        target: /root
-        volume:
-          subpath: ubuntu
-    deploy:
-      mode: global
-      resources:
-        limits:
-          cpus: $CPU
-          memory: $RAM
-
-
   pt-fedora:
     container_name: pt-fedora
     build:
@@ -94,6 +71,8 @@ services:
       network: host
     restart: no
     environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_FEDORA=$EXTRA_FEDORA
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
@@ -110,7 +89,6 @@ services:
           cpus: $CPU
           memory: $RAM
 
-
   pt-opensuse:
     container_name: pt-opensuse
     build:
@@ -119,6 +97,8 @@ services:
       network: host
     restart: no
     environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_OPENSUSE=$EXTRA_OPENSUSE
       - REPO=$REPO
       - BRANCH=$BRANCH
       - EXEC=$EXEC
@@ -134,3 +114,29 @@ services:
         limits:
           cpus: $CPU
           memory: $RAM
+
+  pt-ubuntu:
+    container_name: pt-ubuntu
+    build:
+      context: ./
+      dockerfile: Dockerfiles/ubuntu
+      network: host
+    restart: no
+    environment:
+      - PACKAGES=$PACKAGES
+      - EXTRA_UBUNTU=$EXTRA_UBUNTU
+      - REPO=$REPO
+      - BRANCH=$BRANCH
+      - EXEC=$EXEC
+    volumes:
+      - type: volume
+        source: pt-storage
+        target: /root
+        volume:
+          subpath: ubuntu
+    deploy:
+      mode: global
+      resources:
+        limits:
+          cpus: $CPU
+          memory: $RAM

Config/ProvisionTests/env.standard

@@ -10,6 +10,14 @@ RAM=0.2G
 #STORAGE_DIR=../../Volumes/ProvisionTests
 PT_STORAGE_DIR=/tmp/ProvisionTests
 
+## Packages
+PACKAGES="git bash curl sudo which"
+EXTRA_ARCH=""
+EXTRA_DEBIAN=""
+EXTRA_FEDORA=""
+EXTRA_OPENSUSE=""
+EXTRA_UBUNTU=""
+
 ## Script
 REPO=https://git.hyperling.com/me/env-ansible
 BRANCH=dev