Skip to content

Commit b5fa221

Browse files
authored
Merge pull request #1388 from LLNL/feature/han12/cuda_tutorial_image
AWS tutorial Docker image update
2 parents 90ea1aa + cf439d5 commit b5fa221

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

scripts/docker/dockerfile_gcc-9_cuda-11

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ RUN sudo apt-get install -y supervisor
2121
RUN sudo useradd --create-home --shell /bin/bash ${USER}
2222
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
2323

24+
# Install CMake
25+
RUN wget -q --no-check-certificate https://cmake.org/files/v3.21/cmake-3.21.7-linux-x86_64.tar.gz && \
26+
tar -xzf cmake-3.21.7-linux-x86_64.tar.gz && \
27+
rm -r cmake-3.21.7-linux-x86_64/share/vim/vimfiles && \
28+
cp -fR cmake-3.21.7-linux-x86_64/* /usr && \
29+
rm -rf cmake-3.21.7-linux-x86_64 && \
30+
rm cmake-3.21.7-linux-x86_64.tar.gz
31+
2432
WORKDIR /opt/archives
2533
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 > \
2634
/opt/archives/openvscode-server-v1.69.1-linux-x64.tar.gz

scripts/spack/configs/docker/ubuntu20_cuda/spack.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -166,30 +166,30 @@ spack:
166166
caliper:
167167
require: "@2.10.0~kokkos"
168168
camp:
169-
require: "@2023.06.0"
169+
require: "@2024.02.0"
170170
conduit:
171-
require: "@0.8.8~shared~test~examples~utilities"
171+
require: "@0.9.1~shared~test~examples~utilities"
172172
hdf5:
173173
variants: ~shared~mpi
174174
hypre:
175175
version: [2.24.0]
176176
# do shared mfem to allow PIC flag in mfem
177177
mfem:
178-
require: "@4.5.2+shared~static"
178+
require: "@4.6.0"
179179
raja:
180-
require: "@2023.06.0~shared~examples~exercises"
180+
require: "@2024.02.0~shared~examples~exercises"
181181
scr:
182-
require: "@develop~shared"
182+
require: "@3.0.1~shared~tests~examples"
183183
umpire:
184-
require: "@2023.06.0~shared~examples"
184+
require: "@2024.02.0~shared~examples~werror"
185185

186186
# Globally lock in version of devtools
187187
cmake:
188-
version: [3.20.4]
188+
version: [3.21.7]
189189
buildable: false
190190
externals:
191-
- spec: cmake@3.20.4
192-
prefix: /opt/view
191+
- spec: cmake@3.21.7
192+
prefix: /usr
193193
doxygen:
194194
version: [1.8.17]
195195
buildable: false

0 commit comments

Comments
 (0)