From a303c694a344df83454ccbc15d0f01853b812378 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 30 Jan 2025 20:22:59 -0800
Subject: [PATCH] Always run installation CI in fresh docker image

---
 .github/workflows/install.yml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 3cf9fd041..07f5ac3c5 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -37,67 +37,57 @@ jobs:
         include:
           # Ubuntu Installations
           - name: ubuntu-20.04
-            os: ubuntu-20.04
-            container: null
+            container: ubuntu:20.04
+            imageFamily: debian
             regressionFail: true
           - name: ubuntu-22.04
-            os: ubuntu-22.04
-            container: null
+            container: ubuntu:22.04
+            imageFamily: debian
           - name: ubuntu-24.04
-            os: ubuntu-24.04
-            container: null
+            container: ubuntu:24.04
+            imageFamily: debian
           # Debian Installations
           - name: debian-12
-            os: ubuntu-latest
             image: debian:12
             imageFamily: debian
           - name: debian-11
-            os: ubuntu-latest
             image: debian:11
             imageFamily: debian
           # Red Hat Installations
           - name: rocky-8
-            os: ubuntu-latest
             image: rockylinux:8
             imageFamily: redhat
             regressionFail: true
           - name: rocky-9
-            os: ubuntu-latest
             image: rockylinux:9
             imageFamily: redhat
           - name: almalinux-8
-            os: ubuntu-latest
             image: almalinux:8
             imageFamily: redhat
             regressionFail: true
           - name: almalinux-9
-            os: ubuntu-latest
             image: almalinux:9
             imageFamily: redhat
           # SUSE Installations
           - name: opensuse-15.6
-            os: ubuntu-latest
             image: opensuse/leap:15.6
             imageFamily: suse
           # User level installation
           - name: user-install
-            os: ubuntu-latest
             image: null
             user: true
           # Custom location installation
           - name: custom-install
-            os: ubuntu-latest
             image: null
             riscv_path: /home/riscv
           # Custom location user level installation
           - name: custom-user-install
-            os: ubuntu-latest
             image: null
             user: true
             riscv_path: $HOME/riscv-toolchain
 
     # run on selected version of ubuntu or on ubuntu-latest with docker image
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     container:
       image: ${{ matrix.image }}
       options: --privileged --mount type=bind,source=/,target=/host --pid=host --entrypoint /bin/bash # Allow for connection with host