Tweak naming

LLNL · Dec 14, 2023 · 4438d33 · 4438d33
1 parent 2548ea2
commit 4438d33
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 25 deletions.
diff --git a/ubuntu/clang/Dockerfile b/ubuntu/clang/Dockerfile
@@ -1,5 +1,5 @@
 ARG ubuntu_version
-FROM ghcr.io/llnl/radiuss-ubuntu:$ubuntu_version
+FROM ghcr.io/llnl/radiuss:ubuntu-$ubuntu_version
 
 LABEL maintainer="Chris White <[email protected]>,@vsoch,David Beckingsale <[email protected]>"
 LABEL org.opencontainers.image.source=https://github.com/LLNL/radiuss-docker

diff --git a/ubuntu/clang/uptodate.yaml b/ubuntu/clang/uptodate.yaml
@@ -1,4 +1,5 @@
 dockerbuild:
+  container_basename: radiuss
 
   # Specific combinations of build args to exclude (optional)
   # Spack doesn't work with 14 nor 15
@@ -8,7 +9,7 @@ dockerbuild:
 
   build_args:
     llvm_version:
-      key: llvm
+      key: clang
       versions:
         - "10"
         - "11"

diff --git a/ubuntu/cuda/.uptodate-ignore b/ubuntu/cuda/.uptodate-ignore
diff --git a/ubuntu/cuda/Dockerfile b/ubuntu/cuda/Dockerfile
@@ -1,5 +1,5 @@
-ARG ubuntu_version
-FROM ghcr.io/llnl/radiuss-gcc:$ubuntu_version
+ARG gcc_version
+FROM ghcr.io/llnl/radiuss:gcc-$gcc_version
 
 # Install llvm with spack
 ARG cuda_version

diff --git a/ubuntu/gcc/Dockerfile b/ubuntu/gcc/Dockerfile
@@ -1,5 +1,5 @@
 ARG ubuntu_version
-FROM ghcr.io/llnl/radiuss-ubuntu:$ubuntu_version
+FROM ghcr.io/llnl/radiuss:ubuntu-$ubuntu_version
 
 LABEL maintainer="Chris White <[email protected]>,@vsoch,David Beckingsale <[email protected]>"
 LABEL org.opencontainers.image.source=https://github.com/LLNL/radiuss-docker

diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
@@ -1,4 +1,5 @@
 dockerbuild:
+  container_basename: radiuss
 
   exclude:
     gcc_version: ["11", "12", "13", "8", "9", "10"]

diff --git a/ubuntu/hip-base/Dockerfile b/ubuntu/hip-base/Dockerfile
diff --git a/ubuntu/hip-base/uptodate.yaml b/ubuntu/hip-base/uptodate.yaml
diff --git a/ubuntu/hip/.uptodate-ignore b/ubuntu/hip/.uptodate-ignore
diff --git a/ubuntu/intel/.uptodate-ignore b/ubuntu/intel/.uptodate-ignore