Merge pull request #1388 from LLNL/feature/han12/cuda_tutorial_image

AWS tutorial Docker image update
LLNL · Aug 7, 2024 · b5fa221 · b5fa221
2 parents 90ea1aa + cf439d5
commit b5fa221
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/scripts/docker/dockerfile_gcc-9_cuda-11 b/scripts/docker/dockerfile_gcc-9_cuda-11
@@ -21,6 +21,14 @@ RUN sudo apt-get install -y supervisor
 RUN sudo useradd --create-home --shell /bin/bash ${USER}
 RUN sudo apt-get install doxygen elfutils gfortran graphviz language-pack-en-base less libopenblas-dev libomp-dev mpich python3-sphinx ssh texlive-full tree -fy
 
+# Install CMake
+RUN wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \
+    tar -xzf cmake-3.21.7-linux-x86_64.tar.gz && \
+    rm -r cmake-3.21.7-linux-x86_64/share/vim/vimfiles && \
+    cp -fR cmake-3.21.7-linux-x86_64/* /usr && \
+    rm -rf cmake-3.21.7-linux-x86_64 && \
+    rm cmake-3.21.7-linux-x86_64.tar.gz
+
 WORKDIR /opt/archives
 RUN curl -L https://github.com/gitpod-io/openvscode-server/releases/download/openvscode-server-v1.69.1/openvscode-server-v1.69.1-linux-x64.tar.gz > \
     /opt/archives/openvscode-server-v1.69.1-linux-x64.tar.gz

diff --git a/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml b/scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml
@@ -166,30 +166,30 @@ spack:
     caliper:
       require: "@2.10.0~kokkos"
     camp:
-      require: "@2023.06.0"
+      require: "@2024.02.0"
     conduit:
-      require: "@0.8.8~shared~test~examples~utilities"
+      require: "@0.9.1~shared~test~examples~utilities"
     hdf5:
       variants: ~shared~mpi
     hypre:
       version: [2.24.0]
     # do shared mfem to allow PIC flag in mfem
     mfem:
-      require: "@4.5.2+shared~static"
+      require: "@4.6.0"
     raja:
-      require: "@2023.06.0~shared~examples~exercises"
+      require: "@2024.02.0~shared~examples~exercises"
     scr:
-      require: "@develop~shared"
+      require: "@3.0.1~shared~tests~examples"
     umpire:
-      require: "@2023.06.0~shared~examples"
+      require: "@2024.02.0~shared~examples~werror"
 
     # Globally lock in version of devtools
     cmake:
-      version: [3.20.4]
+      version: [3.21.7]
       buildable: false
       externals:
-      - spec: cmake@3.20.4
-        prefix: /opt/view
+      - spec: cmake@3.21.7
+        prefix: /usr
     doxygen:
       version: [1.8.17]
       buildable: false