Commit 9f93a449 authored by Scott Wittenburg's avatar Scott Wittenburg

Update system compilers and test script, remove suite-sparse constraints

parent 5d8b4ab0
......@@ -13,9 +13,13 @@ RUN apt-get update -y && \
clang \
clang-3.7 \
emacs \
file \
g++ \
g++-6 \
gcc \
gcc-6 \
gfortran \
gfortran-6 \
git \
gnupg2 \
iproute2 \
......@@ -35,21 +39,21 @@ RUN apt-get update -y && \
apt-get clean
RUN mkdir -p /mirror/build_cache && \
aws s3 sync ${REMOTE_BUILDCACHE_URL} /mirror/build_cache
aws s3 sync ${REMOTE_BUILDCACHE_URL} /mirror
COPY /public.key /mirror/public.key
# COPY /packages.yaml /etc/spack/packages.yaml
COPY /packages.yaml /etc/spack/packages.yaml
COPY /tutorial-test.sh /tutorial/.test/tutorial-test.sh
### TODO: Find another way to set perms without increasing the image download size
RUN useradd -ms /bin/bash spack && \
chmod -R go+r /mirror && \
# chmod -R go+r /etc/spack && \
chmod -R go+r /etc/spack && \
chmod go+rx /tutorial/.test/tutorial-test.sh
USER spack
WORKDIR /home/spack
CMD ["bash"]i
CMD ["bash"]
packages:
all:
target: [x86_64]
......@@ -28,13 +28,13 @@ spack mirror add tutorial /mirror
spack gpg trust /mirror/public.key
spack install zlib %clang
spack install zlib @1.2.8
spack install zlib %gcc@7.5.0
spack install zlib %gcc@6.5.0
spack install zlib @1.2.8 cppflags=-O3
spack find
spack find -lf
spack install tcl
spack install tcl ^zlib @1.2.8 %clang
spack install tcl ^/64mn
spack install tcl ^/h6i5
spack find -ldf
spack install hdf5
spack install hdf5~mpi
......
......@@ -88,8 +88,6 @@ spack:
modules:
enable: []
packages:
suite-sparse:
version: [5.3.0, 5.4.0, 5.5.0, 5.6.0]
all:
target: [x86_64]
repos: []
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment