Cleanup GCC

LLNL · Dec 12, 2023 · 000637c · 000637c
1 parent 578684f
commit 000637c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git 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
@@ -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
+WORKDIR /home/radiuss
diff --git 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"