diff --git a/ubuntu/clang/Dockerfile b/ubuntu/clang/Dockerfile index 1faa856..54949d6 100644 --- 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 ,@vsoch,David Beckingsale " LABEL org.opencontainers.image.source=https://github.com/LLNL/radiuss-docker diff --git a/ubuntu/clang/uptodate.yaml b/ubuntu/clang/uptodate.yaml index 63f6167..f4ba949 100644 --- 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 new file mode 100644 index 0000000..e69de29 diff --git a/ubuntu/cuda/Dockerfile b/ubuntu/cuda/Dockerfile index db9594d..147fbb0 100644 --- 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 index ad93dbe..6de2eb5 100644 --- 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 ,@vsoch,David Beckingsale " LABEL org.opencontainers.image.source=https://github.com/LLNL/radiuss-docker diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml index 49e7ddf..d248f39 100644 --- 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 deleted file mode 100644 index ff53a9d..0000000 --- a/ubuntu/hip-base/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG ubuntu_version -FROM ghcr.io/rse-ops/ubuntu:$ubuntu_version -ARG llvm_amdgpu_version -ENV llvm_amdgpu_version=$llvm_amdgpu_version -RUN spack add llvm-amdgpu@${llvm_amdgpu_version} && \ - spack install --only dependencies --deprecated diff --git a/ubuntu/hip-base/uptodate.yaml b/ubuntu/hip-base/uptodate.yaml deleted file mode 100644 index cb740cc..0000000 --- a/ubuntu/hip-base/uptodate.yaml +++ /dev/null @@ -1,14 +0,0 @@ -dockerbuild: - - build_args: - llvm_amdgpu_version: - key: llvm-amdgpu - versions: - - "5.3.0" - - "5.2.3" - - # Look for ubuntu versions for our base builds - ubuntu_version: - key: ubuntu - versions: - - "20.04" diff --git a/ubuntu/hip/.uptodate-ignore b/ubuntu/hip/.uptodate-ignore new file mode 100644 index 0000000..e69de29 diff --git a/ubuntu/intel/.uptodate-ignore b/ubuntu/intel/.uptodate-ignore new file mode 100644 index 0000000..e69de29