Commit 8c4a913e authored by Scott Wittenburg's avatar Scott Wittenburg

Replace broken/missing pkgs, fix typos

parent 312972c5
......@@ -6,20 +6,19 @@ ARG AWS_ACCESS_KEY_ID="None"
ARG AWS_SECRET_ACCESS_KEY="None"
RUN apt-get update -y && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
autoconf
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
autoconf \
ca-certificates \
curl \
clang \
clang-3.7 \
emacs \
g++ \
g++-4.7 \
g++-4.8 \
gcc \
gcc-4.7 \
gcc-4.8 \
gfortran \
gfortran-4.7 \
gfortran-4.8 \
git \
gnupg2 \
iproute2 \
......@@ -34,25 +33,26 @@ RUN apt-get update -y && \
python3 -m pip install --upgrade pip setuptools wheel && \
python3 -m pip install --upgrade gnureadline && \
python3 -m pip install --upgrade awscli && \
update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
apt-get autoremove --purge && \
apt-get clean && \
ln -s /usr/bin/gpg /usr/bin/gpg2
apt-get clean
RUN mkdir -p /mirror/build_cache && \
aws s3 sync ${REMOTE_BUILDCACHE_URL} /mirror/build_cache
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"]
CMD ["bash"]i
......@@ -28,7 +28,7 @@ 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@4.7
spack install zlib %gcc@4.8
spack install zlib @1.2.8 cppflags=-O3
spack find
spack find -lf
......
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