From 000637c380f7d3536287e8514a5fa21f21b6fbe9 Mon Sep 17 00:00:00 2001
From: David Beckingsale <davidbeckingsale@gmail.com>
Date: Tue, 12 Dec 2023 14:00:11 -0800
Subject: [PATCH] Cleanup GCC

---
 ubuntu/clang/Dockerfile  |  3 +--
 ubuntu/gcc/Dockerfile    | 11 +++++------
 ubuntu/gcc/uptodate.yaml | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ubuntu/clang/Dockerfile b/ubuntu/clang/Dockerfile
index f8b974a..2fcde8c 100644
--- a/ubuntu/clang/Dockerfile
+++ b/ubuntu/clang/Dockerfile
@@ -1,8 +1,7 @@
 ARG ubuntu_version
 FROM ghcr.io/llnl/ubuntu:$ubuntu_version
 
-# Install llvm with spack
-# ARG llvm_version
+ARG llvm_version
 ENV llvm_version=${llvm_version}
 
 RUN \
diff --git a/ubuntu/gcc/Dockerfile b/ubuntu/gcc/Dockerfile
index dc778e8..7cee5fb 100644
--- a/ubuntu/gcc/Dockerfile
+++ b/ubuntu/gcc/Dockerfile
@@ -1,9 +1,8 @@
 ARG ubuntu_version
-#FROM ghcr.io/rse-ops/ubuntu:$ubuntu_version
-FROM ubuntu-base
-# ARG gcc_version
-# ENV gcc_version=$gcc_version
-ENV gcc_version=9
+FROM ghcr.io/llnl/ubuntu:$ubuntu_version
+
+ARG gcc_version
+ENV gcc_version=$gcc_version
 
 RUN \
     sudo apt-get -qq update \
@@ -17,4 +16,4 @@ RUN \
     && sudo apt-get clean
 
 USER radiuss
-WORKDIR /home/radiuss
\ No newline at end of file
+WORKDIR /home/radiuss
diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
index 4635c68..49e7ddf 100644
--- a/ubuntu/gcc/uptodate.yaml
+++ b/ubuntu/gcc/uptodate.yaml
@@ -1,14 +1,23 @@
 dockerbuild:
+
+  exclude:
+    gcc_version: ["11", "12", "13", "8", "9", "10"]
+    ubuntu_version: ["20.04", "20.04", "20.04", "22.04", "22.04", "22.04"]
+
   build_args:
     gcc_version:
       key: gcc
       versions:
-       - "9.4.0"
-       - "10.3.0"
-       - "11.2.0"
+       - "8"
+       - "9"
+       - "10" #20.04
+       - "11"
+       - "12"
+       - "13"
 
     # Look for ubuntu versions for our base builds
     ubuntu_version:
       key: ubuntu
       versions:
         - "20.04"
+        - "22.04"