Updates

.github/scripts/build.sh

@@ -11,12 +11,12 @@ printf "Tag is ${tag}\n"
 container=$(basename $(dirname $basedir))          
 printf "Container is ${container}\n"
 cat ${result_name}
-container_name=ghcr.io/rse-ops/${container}:${tag}
+container_name=ghcr.io/llnl/radiuss-${container}:${tag}
 docker pull ${container_name} || echo "Container $container_name does not exist yet"
 printf "docker build -f ${dockerfile} -t ${container_name} .\n"
 docker build -f ${dockerfile} -t ${container_name} .
 
 echo "container_uri=${container_name}" >> $GITHUB_OUTPUT
-echo "uri=ghcr.io/rse-ops/${container}" >> $GITHUB_OUTPUT
+echo "uri=ghcr.io/llnl/radiuss-${container}" >> $GITHUB_OUTPUT
 echo "tag=${tag}" >> $GITHUB_OUTPUT
 echo "dockerfile_dir=${basedir}" >> $GITHUB_OUTPUT

.github/workflows/build-matrices.yaml

@@ -51,7 +51,7 @@ jobs:
       with: 
         root: ${{ steps.parsed_files.outputs.parsed_files }}
         parser: dockerbuild
-        flags: "--registry ghcr.io/rse-ops --all"
+        flags: "--registry ghcr.io/llnl --all"
       # END PULL REQUEST / PUSH checkout and file derivation =======================
 
       # START SCHEDULED checkout and file derivation =======================
@@ -66,7 +66,7 @@ jobs:
       with: 
         root: .
         parser: dockerbuild
-        flags: "--registry ghcr.io/rse-ops --all"    
+        flags: "--registry ghcr.io/llnl --all"    
       # END SCHEDULED checkout and file derivation
 
     - name: View Build Matrix Result

ubuntu/clang/Dockerfile

@@ -1,5 +1,8 @@
 ARG ubuntu_version
-FROM ghcr.io/llnl/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
 
 ARG llvm_version
 ENV llvm_version=${llvm_version}

ubuntu/cuda/Dockerfile

@@ -1,13 +1,22 @@
 ARG ubuntu_version
-FROM ghcr.io/rse-ops/ubuntu:$ubuntu_version
+FROM ghcr.io/llnl/radiuss-gcc:$ubuntu_version
 
 # Install llvm with spack
 ARG cuda_version
 ENV cuda_version=$cuda_version
 
-RUN spack add cuda@${cuda_version} && \
-    spack mirror add develop https://binaries.spack.io/releases/develop && \
-    spack buildcache keys --install --trust && \
-    spack install
-RUN spack view --dependencies no symlink --ignore-conflicts /opt/view cuda@${cuda_version} && \
-  spack compiler find
+RUN \
+    sudo apt-get -qq update \
+    && sudo apt-get -qq install -y --no-install-recommends \
+        clang-${llvm_version} clang-format-${llvm_version} llvm-${llvm_version} \
+    && sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${llvm_version} 100 \
+    && sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${llvm_version} 100 \
+    && sudo rm -rf /var/lib/apt/lists/* \
+    && sudo apt-get clean
+
+USER radiuss
+WORKDIR /home/radiuss

ubuntu/gcc/Dockerfile

@@ -1,5 +1,8 @@
 ARG ubuntu_version
-FROM ghcr.io/llnl/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
 
 ARG gcc_version
 ENV gcc_version=$gcc_version

ubuntu/intel/Dockerfile

@@ -1,5 +1,5 @@
 ARG ubuntu_version
-FROM ghcr.io/rse-ops/ubuntu:$ubuntu_version
+FROM ghcr.io/llnl/radiuss-ubuntu:$ubuntu_version
 
 # Install intel-oneapi with spack
 ARG intel_version

ubuntu/intel/uptodate.yaml

@@ -9,7 +9,7 @@ dockerbuild:
     # Look for ubuntu versions for our base builds
     ubuntu_version:
       key: ubuntu
-      name: ghcr.io/rse-ops/ubuntu
+      name: ghcr.io/llnl/ubuntu
       type: container
       startat: "20.04"
       filter: