docker: fix builds, remove extra distros, add ci builds (#11621)

* fix docker builds/remove extra builds/add ci builds
* preinstall vim in CI builder images
* simplify & streamline docker resources
* restore os-container-mapping.yaml file

25 files changed, 304 insertions, 635 deletions

diff --git a/share/spack/docker/Dockerfile b/share/spack/docker/Dockerfile
deleted file mode 100644
index 459dd464a5..0000000000
--- a/share/spack/docker/Dockerfile
+++ /dev/null
@@ -1,177 +0,0 @@
-ARG BASE
-
-FROM $BASE
-MAINTAINER Spack Maintainers <maintainers@spack.io>
-
-ARG BASE
-ARG DISTRO
-ARG DISTRO_VERSION
-
-ENV DOCKERFILE_BASE=$BASE                     \
-    DOCKERFILE_DISTRO=$DISTRO                 \
-    DOCKERFILE_DISTRO_VERSION=$DISTRO_VERSION \
-    SPACK_ROOT=/opt/spack                     \
-    FORCE_UNSAFE_CONFIGURE=1                  \
-    DEBIAN_FRONTEND=noninteractive            \
-    CURRENTLY_BUILDING_DOCKER_IMAGE=1         \
-    container=docker
-
-COPY bin   $SPACK_ROOT/bin
-COPY etc   $SPACK_ROOT/etc
-COPY lib   $SPACK_ROOT/lib
-COPY share $SPACK_ROOT/share
-COPY var   $SPACK_ROOT/var
-RUN mkdir -p $SPACK_ROOT/opt/spack
-
-MASK PUSH
-MASK [[ $DISTRO == arch ]]
-RUN pacman -Syu --noconfirm                                    \
- && pacman -Sy --noconfirm                                     \
-        base-devel   ca-certificates curl    gcc               \
-        gcc-fortran  git             gnupg2  inetutils         \
-        iproute2     make            openssh procps-ng         \
-        python       python-pip      sudo    tcl               \
-        unzip                                                  \
- && echo 'nobody ALL=(ALL) NOPASSWD: ALL' >                    \
-        /etc/sudoers.d/nobody-sudo                             \
- && sudo -u nobody git clone                                   \
-        'https://aur.archlinux.org/lua-std-_debug.git'         \
-        '/tmp/lua-std-_debug'                                  \
- && sudo -u nobody git clone                                   \
-        'https://aur.archlinux.org/lua-std-normalize.git'      \
-        '/tmp/lua-std-normalize'                               \
- && sudo -u nobody git clone                                   \
-        'https://aur.archlinux.org/lua-posix.git'              \
-        '/tmp/lua-posix'                                       \
- && (  cd /tmp/lua-std-_debug                                  \
- &&    sudo -u nobody makepkg -si --asdeps --noconfirm )       \
- && (  cd /tmp/lua-std-normalize                               \
- &&    sudo -u nobody makepkg -si --asdeps --noconfirm )       \
- && (  cd /tmp/lua-posix                                       \
- &&    sudo -u nobody makepkg -si --asdeps --noconfirm )       \
- && sudo -u nobody git clone                                   \
-        'https://aur.archlinux.org/lmod.git' '/tmp/lmod'       \
- && (  cd /tmp/lmod                                            \
- &&    sudo -u nobody makepkg -si --noconfirm )                \
- && rm -rf /tmp/lua-std-_debug /tmp/lua-std-normalize          \
-           /tmp/lmod /etc/sudoers.d/nobody-sudo
-
-MASK [[ $DISTRO =~ (centos|rhel.*) ]]
-RUN yum update -y
-
-  MASK PUSH
-  MASK [[ $DISTRO =~ rhel.* ]]
-  RUN (  yum install -y yum-conf-repos.noarch                         \
-   ||    yum install -y yum-conf-epel.noarch yum-conf-elrepo.noarch ) \
-   && yum update -y
-  MASK POP
-
-RUN yum install -y epel-release                               \
- && yum update -y                                             \
- && yum --enablerepo epel groupinstall -y "Development Tools" \
- && yum --enablerepo epel install -y                          \
-        curl           findutils gcc-c++    gcc               \
-        gcc-gfortran   git       gnupg2     hostname          \
-        iproute        Lmod      make       patch             \
-        openssh-server python    python-pip tcl               \
-        unzip                                                 \
- && rm -rf /var/cache/yum                                     \
- && yum clean all
-
-MASK [[ $DISTRO == fedora ]]
-RUN dnf update -y                                            \
- && dnf group install -y "C Development Tools and Libraries" \
- && dnf install -y                                           \
-        @development-tools                                   \
-        curl            findutils    gcc-c++     gcc         \
-        gcc-gfortran    git          gnupg2      hostname    \
-        iproute         Lmod         make        patch       \
-        openssh-server  python       tcl         unzip       \
- && dnf clean all
-
-MASK [[ $DISTRO == opensuse ]]
-RUN zypper -n ref                                              \
- && zypper -n up --skip-interactive --no-recommends            \
- && zypper -n install -l --no-recommends --type pattern        \
-        devel_basis  devel_C_C++                               \
- && zypper -n install -l --no-recommends                       \
-        bash        bash-completion ca-certificates curl       \
-        findutils   gcc             gcc-locale      gcc-c++    \
-        gcc-fortran git             glibc-locale    gpg2       \
-        hostname    iproute         lua-lmod        make       \
-        patch       openssh         python          python-pip \
-        python-xml  tcl             unzip                      \
- && zypper clean                                               \
- && rm -rf /var/cache/zypp/*
-
-MASK [[ $DISTRO == ubuntu ]]
-RUN apt-get -yqq update                                   \
- && apt-get -yqq install                                  \
-        build-essential ca-certificates curl       g++    \
-        gcc             gfortran        git        gnupg2 \
-        iproute2        lmod            lua-posix  make   \
-        openssh-server  python          python-pip tcl    \
-        unzip
-
-  MASK PUSH
-  MASK [[ $DISTRO_VERSION == 18.04 ]]
-  # [WORKAROUND]
-  # https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
-  RUN ln -s posix_c.so /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so
-  MASK POP
-
-RUN rm -rf /var/lib/apt/lists/*
-
-MASK POP
-
-RUN rm -rf $SPACK_ROOT/.git                                                \
- && pip install boto3                                                      \
- && (  echo ". /usr/share/lmod/lmod/init/bash"                             \
-    && echo ". \\\$SPACK_ROOT/share/spack/setup-env.sh"                    \
-    && echo "if [ \\\"\\\$CURRENTLY_BUILDING_DOCKER_IMAGE\\\" '!=' '1' ]"  \
-    && echo "then"                                                         \
-    && echo "  . \\\$SPACK_ROOT/share/spack/spack-completion.bash"         \
-    && echo "fi"                                                   )       \
-        >> /etc/profile.d/spack.sh                                         \
- && (  echo "f=\\\"\\\$SPACK_ROOT/share/spack/docker/handle-ssh.sh\\\""    \
-    && echo "if [ -f \\\"\\\$f\\\" ]"                                      \
-    && echo "then"                                                         \
-    && echo "  .  \\\"\\\$f\\\""                                           \
-    && echo "else"                                                         \
-    && cat  $SPACK_ROOT/share/spack/docker/handle-ssh.sh                   \
-    && echo "fi"                                                   )       \
-        >> /etc/profile.d/handle-ssh.sh                                    \
- && (  echo "f=\\\"\\\$SPACK_ROOT/share/spack/docker/handle-prompt.sh\\\"" \
-    && echo "if [ -f \\\"\\\$f\\\" ]"                                      \
-    && echo "then"                                                         \
-    && echo "  .  \\\"\\\$f\\\""                                           \
-    && echo "else"                                                         \
-    && cat  $SPACK_ROOT/share/spack/docker/handle-prompt.sh                \
-    && echo "fi"                                                   )       \
-        >> /etc/profile.d/handle-prompt.sh                                 \
- && mkdir -p /root/.spack                                                  \
- && cp $SPACK_ROOT/share/spack/docker/modules.yaml                         \
-        /root/.spack/modules.yaml                                          \
- && rm -rf /root/*.*
-
-MASK PUSH
-MASK [[ $DISTRO_VERSION =~ (centos|fedora|opensuse|rhel.*) ]]
-RUN rm -f /run/nologin
-MASK POP
-
-# [WORKAROUND]
-# https://superuser.com/questions/1241548/
-#     xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889
-RUN [ -f ~/.profile ]                                               \
- && sed -i 's/mesg n/( tty -s \\&\\& mesg n || true )/g' ~/.profile \
- || true
-
-WORKDIR /root
-SHELL ["/bin/bash", "-l", "-c"]
-
-# TODO: add a command to Spack that (re)creates the package cache
-RUN spack spec hdf5+mpi
-
-ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
-CMD ["docker-shell"]
-
diff --git a/share/spack/docker/build-image.sh b/share/spack/docker/build-image.sh
deleted file mode 100755
index b97a368610..0000000000
--- a/share/spack/docker/build-image.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/env bash
-#
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-script="$( basename "$0" )"
-cd "$( dirname "$0" )"
-
-if [ -z "$BASE_IMAGE" ] ; then
-    BASE_IMAGE="ubuntu"
-fi
-
-if [ -z "$BASE_TAG" ] ; then
-    BASE_TAG="latest"
-fi
-
-if [ -z "$DISTRO" ] ; then
-    DISTRO="${BASE_IMAGE}"
-fi
-
-if [ -z "$DISTRO_VERSION" ] ; then
-    DISTRO_VERSION="${BASE_TAG}"
-fi
-
-if [ -z "$BASE_NAME" ] ; then
-    BASE_NAME="${DISTRO}"
-fi
-
-if [ "$BASE_TAG" '=' 'latest' ] ; then
-    BASE_TAG=""
-fi
-
-if [ -n "$BASE_TAG" ] ; then
-    BASE_TAG=":${BASE_TAG}"
-fi
-
-TAG="spack/${BASE_NAME}${BASE_TAG}"
-
-export BASE_IMAGE BASE_TAG DISTRO DISTRO_VERSION BASE_NAME TAG
-
-if [ "$script" '=' 'run-image.sh' ] ; then
-    com="docker run --rm -ti"
-
-    if [ -z "$DISABLE_MOUNT" ] ; then
-        DISABLE_MOUNT=1
-        if [ -z "$*" ] ; then
-            DISABLE_MOUNT=0
-        fi
-    fi
-
-    if [ "$DISABLE_MOUNT" '==' 0 ] ; then
-        com="${com} -v \"$( readlink -f ../../.. ):/spack\""
-    fi
-
-    eval "exec ${com}" "${TAG}" "$@"
-elif [ "$script" '=' 'render-image-template.sh' ] ; then
-    ./dpp.bash Dockerfile
-elif [ "$script" '=' 'push-image.sh' ] ; then
-    docker push "${TAG}"
-    for tag in ${EXTRA_TAGS} ; do
-        docker push "spack/${BASE_NAME}:${tag}"
-    done
-else
-    tag_options="-t ${TAG}"
-    for tag in ${EXTRA_TAGS} ; do
-        tag_options="${tag_options} -t spack/${BASE_NAME}:${tag}"
-    done
-
-    cache_options=""
-    if docker pull "${TAG}" ; then
-        cache_options="--cache-from ${TAG}"
-    fi
-
-    exec ./render-image-template.sh |
-         docker build -f -                                           \
-                      ${cache_options}                               \
-                      ${tag_options}                                 \
-                      --build-arg BASE="${BASE_IMAGE}${BASE_TAG}"    \
-                      --build-arg DISTRO="${DISTRO}"                 \
-                      --build-arg DISTRO_VERSION="${DISTRO_VERSION}" \
-                      ../../..
-fi
diff --git a/share/spack/docker/centos-6.dockerfile b/share/spack/docker/centos-6.dockerfile
new file mode 100644
index 0000000000..d776f903da
--- /dev/null
+++ b/share/spack/docker/centos-6.dockerfile
@@ -0,0 +1,76 @@
+FROM centos:6
+MAINTAINER Spack Maintainers <maintainers@spack.io>
+
+ENV DOCKERFILE_BASE=centos            \
+    DOCKERFILE_DISTRO=centos          \
+    DOCKERFILE_DISTRO_VERSION=6       \
+    SPACK_ROOT=/opt/spack             \
+    FORCE_UNSAFE_CONFIGURE=1          \
+    DEBIAN_FRONTEND=noninteractive    \
+    CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
+    container=docker
+
+COPY bin   $SPACK_ROOT/bin
+COPY etc   $SPACK_ROOT/etc
+COPY lib   $SPACK_ROOT/lib
+COPY share $SPACK_ROOT/share
+COPY var   $SPACK_ROOT/var
+RUN mkdir -p $SPACK_ROOT/opt/spack
+
+RUN yum update -y                                             \
+ && yum install -y epel-release                               \
+ && yum update -y                                             \
+ && yum --enablerepo epel groupinstall -y "Development Tools" \
+ && yum --enablerepo epel install -y                          \
+        curl           findutils gcc-c++    gcc               \
+        gcc-gfortran   git       gnupg2     hostname          \
+        iproute        Lmod      make       patch             \
+        openssh-server python    python-pip tcl               \
+        unzip          which                                  \
+ && pip install boto3                                         \
+ && rm -rf /var/cache/yum                                     \
+ && yum clean all
+
+RUN ( echo ". /usr/share/lmod/lmod/init/bash"                       \
+ &&   echo ". \$SPACK_ROOT/share/spack/setup-env.sh"                \
+ &&   echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]"  \
+ &&   echo "then"                                                   \
+ &&   echo "  . \$SPACK_ROOT/share/spack/spack-completion.bash"     \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/spack.sh                                   \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-ssh.sh\""    \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-ssh.sh             \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-ssh.sh                              \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-prompt.sh\"" \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-prompt.sh          \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-prompt.sh                           \
+ && mkdir -p /root/.spack                                           \
+ && cp $SPACK_ROOT/share/spack/docker/modules.yaml                  \
+        /root/.spack/modules.yaml                                   \
+ && rm -rf /root/*.* /run/nologin $SPACK_ROOT/.git
+
+# [WORKAROUND]
+# https://superuser.com/questions/1241548/
+#     xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889
+RUN [ -f ~/.profile ]                                               \
+ && sed -i 's/mesg n/( tty -s \\&\\& mesg n || true )/g' ~/.profile \
+ || true
+
+WORKDIR /root
+SHELL ["/bin/bash", "-l", "-c"]
+
+# TODO: add a command to Spack that (re)creates the package cache
+RUN spack spec hdf5+mpi
+
+ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
+CMD ["docker-shell"]
diff --git a/share/spack/docker/centos-7.dockerfile b/share/spack/docker/centos-7.dockerfile
new file mode 100644
index 0000000000..153593a4c5
--- /dev/null
+++ b/share/spack/docker/centos-7.dockerfile
@@ -0,0 +1,76 @@
+FROM centos:7
+MAINTAINER Spack Maintainers <maintainers@spack.io>
+
+ENV DOCKERFILE_BASE=centos            \
+    DOCKERFILE_DISTRO=centos          \
+    DOCKERFILE_DISTRO_VERSION=7       \
+    SPACK_ROOT=/opt/spack             \
+    FORCE_UNSAFE_CONFIGURE=1          \
+    DEBIAN_FRONTEND=noninteractive    \
+    CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
+    container=docker
+
+COPY bin   $SPACK_ROOT/bin
+COPY etc   $SPACK_ROOT/etc
+COPY lib   $SPACK_ROOT/lib
+COPY share $SPACK_ROOT/share
+COPY var   $SPACK_ROOT/var
+RUN mkdir -p $SPACK_ROOT/opt/spack
+
+RUN yum update -y                                             \
+ && yum install -y epel-release                               \
+ && yum update -y                                             \
+ && yum --enablerepo epel groupinstall -y "Development Tools" \
+ && yum --enablerepo epel install -y                          \
+        curl           findutils gcc-c++    gcc               \
+        gcc-gfortran   git       gnupg2     hostname          \
+        iproute        Lmod      make       patch             \
+        openssh-server python    python-pip tcl               \
+        unzip          which                                  \
+ && pip install boto3                                         \
+ && rm -rf /var/cache/yum                                     \
+ && yum clean all
+
+RUN ( echo ". /usr/share/lmod/lmod/init/bash"                       \
+ &&   echo ". \$SPACK_ROOT/share/spack/setup-env.sh"                \
+ &&   echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]"  \
+ &&   echo "then"                                                   \
+ &&   echo "  . \$SPACK_ROOT/share/spack/spack-completion.bash"     \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/spack.sh                                   \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-ssh.sh\""    \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-ssh.sh             \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-ssh.sh                              \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-prompt.sh\"" \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-prompt.sh          \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-prompt.sh                           \
+ && mkdir -p /root/.spack                                           \
+ && cp $SPACK_ROOT/share/spack/docker/modules.yaml                  \
+        /root/.spack/modules.yaml                                   \
+ && rm -rf /root/*.* /run/nologin $SPACK_ROOT/.git
+
+# [WORKAROUND]
+# https://superuser.com/questions/1241548/
+#     xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889
+RUN [ -f ~/.profile ]                                               \
+ && sed -i 's/mesg n/( tty -s \\&\\& mesg n || true )/g' ~/.profile \
+ || true
+
+WORKDIR /root
+SHELL ["/bin/bash", "-l", "-c"]
+
+# TODO: add a command to Spack that (re)creates the package cache
+RUN spack spec hdf5+mpi
+
+ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
+CMD ["docker-shell"]
diff --git a/share/spack/docker/config/arch.bash b/share/spack/docker/config/arch.bash
deleted file mode 100644
index 0599b3454b..0000000000
--- a/share/spack/docker/config/arch.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE="archlinux/base"
-export BASE_NAME="archlinux"
-export DISTRO="arch"
diff --git a/share/spack/docker/config/centos-6.bash b/share/spack/docker/config/centos-6.bash
deleted file mode 100644
index fd80f07143..0000000000
--- a/share/spack/docker/config/centos-6.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=centos
-export BASE_TAG="6"
-export EXTRA_TAGS="centos6"
diff --git a/share/spack/docker/config/centos-7.bash b/share/spack/docker/config/centos-7.bash
deleted file mode 100644
index dd5d10c9b9..0000000000
--- a/share/spack/docker/config/centos-7.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=centos
-export BASE_TAG="7"
-export EXTRA_TAGS="centos7 latest"
diff --git a/share/spack/docker/config/fedora-24.bash b/share/spack/docker/config/fedora-24.bash
deleted file mode 100644
index d104056c76..0000000000
--- a/share/spack/docker/config/fedora-24.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=fedora
-export BASE_TAG="24"
diff --git a/share/spack/docker/config/fedora-29.bash b/share/spack/docker/config/fedora-29.bash
deleted file mode 100644
index 8dd3a01796..0000000000
--- a/share/spack/docker/config/fedora-29.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=fedora
-export BASE_TAG="29"
-export EXTRA_TAGS="latest"
diff --git a/share/spack/docker/config/opensuse-leap.bash b/share/spack/docker/config/opensuse-leap.bash
deleted file mode 100644
index 932d2f0d46..0000000000
--- a/share/spack/docker/config/opensuse-leap.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=opensuse
-export BASE_TAG="leap"
diff --git a/share/spack/docker/config/opensuse-tumbleweed.bash b/share/spack/docker/config/opensuse-tumbleweed.bash
deleted file mode 100644
index bb004cb2be..0000000000
--- a/share/spack/docker/config/opensuse-tumbleweed.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset DISTRO_VERSION
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=opensuse
-export BASE_TAG="tumbleweed"
-export EXTRA_TAGS="latest"
diff --git a/share/spack/docker/config/scilinux-6.bash b/share/spack/docker/config/scilinux-6.bash
deleted file mode 100644
index aa705b65c1..0000000000
--- a/share/spack/docker/config/scilinux-6.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=sl
-export BASE_TAG="6"
-export BASE_NAME=scilinux
-export DISTRO=rhel6
diff --git a/share/spack/docker/config/scilinux-7.bash b/share/spack/docker/config/scilinux-7.bash
deleted file mode 100644
index 290e0a0797..0000000000
--- a/share/spack/docker/config/scilinux-7.bash
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=sl
-export BASE_TAG="7"
-export BASE_NAME=scilinux
-export DISTRO=rhel7
-export EXTRA_TAGS="latest"
diff --git a/share/spack/docker/config/ubuntu-1604.bash b/share/spack/docker/config/ubuntu-1604.bash
deleted file mode 100644
index bbcbd870e5..0000000000
--- a/share/spack/docker/config/ubuntu-1604.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=ubuntu
-export BASE_TAG="16.04"
-export EXTRA_TAGS="xenial"
diff --git a/share/spack/docker/config/ubuntu-1804.bash b/share/spack/docker/config/ubuntu-1804.bash
deleted file mode 100644
index 51d2899092..0000000000
--- a/share/spack/docker/config/ubuntu-1804.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-unset DISTRO
-unset BASE_IMAGE
-unset BASE_NAME
-unset BASE_TAG
-unset TAG
-unset EXTRA_TAGS
-
-export BASE_IMAGE=ubuntu
-export BASE_TAG="18.04"
-export EXTRA_TAGS="bionic latest"
diff --git a/share/spack/docker/dpp.bash b/share/spack/docker/dpp.bash
deleted file mode 100755
index 24ee9be7be..0000000000
--- a/share/spack/docker/dpp.bash
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /usr/bin/env bash
-#
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-function prefix_tokens() {
-    line="$1" ; shift
-    nprefix="$1"
-
-    line="${line::$nprefix} "
-    echo "${line::$nprefix}"
-}
-
-
-# read file contents, or stdin
-cat "$1" |
-
-# remove blank lines
-grep -v '^ *$' |
-
-# remove leading whitespace
-sed 's/^ *//g' |
-
-# remove comments
-grep -v '^#.*' |
-
-# remove trailing whitespace
-sed 's/ *$//g' |
-
-# remove extraneous whitespace
-sed 's/  */ /g' |
-
-# mask out subsections
-(
-    stack_level=1
-    mask_level=1
-
-    while read LINE ; do
-        try_print=1
-
-        if [ "$( prefix_tokens "$LINE" 10 )" '=' 'MASK PUSH ' ] ; then
-            tmp="$stack_level"
-            stack_level="$(( stack_level + 1 ))"
-            if [ "$mask_level" '=' "$tmp" ] ; then
-                mask_level="$stack_level"
-            fi
-            try_print=0
-        elif [ "$( prefix_tokens "$LINE" 9 )" '=' 'MASK POP ' ] ; then
-            stack_level="$(( stack_level - 1 ))"
-            if [ "$mask_level" -gt "$stack_level" ] ; then
-                mask_level="$stack_level"
-            fi
-            try_print=0
-        elif [ "$( prefix_tokens "$LINE" 5 )" '=' 'MASK ' ] ; then
-            if [ "$(( mask_level + 1 ))" -ge "$stack_level" ] ; then
-                mask_level="$stack_level"
-                eval "${LINE:5}"
-                if [ "$?" '!=' 0 ] ; then
-                    mask_level="$(( mask_level - 1 ))"
-                fi
-            fi
-            try_print=0
-        fi
-
-        if [ "$stack_level" -lt 1 ] ; then
-            stack_level=1
-            mask_level=0
-        fi
-
-        if [ "$try_print" '=' 1 -a "$mask_level" '=' "$stack_level" ] ; then
-            echo "$LINE"
-        fi
-    done
-)
-
diff --git a/share/spack/docker/handle-prompt.sh b/share/spack/docker/handle-prompt.sh
index c8bbccaf71..1f44deb61e 100644
--- a/share/spack/docker/handle-prompt.sh
+++ b/share/spack/docker/handle-prompt.sh
@@ -61,11 +61,11 @@ __write() {
 }
 
 __revparse_head() {
-    head="`git -C /spack rev-parse $@ HEAD 2>/dev/null`"
+    head="`git -C "$SPACK_ROOT" rev-parse $@ HEAD 2>/dev/null`"
     result="$?"
     if [ "$result" '!=' '0' ] ; then
-        head="`git --git-dir=/spack/.git \\
-              --work-tree=/spack rev-parse $@ HEAD 2>/dev/null`"
+        head="`git --git-dir="$SPACK_ROOT"/.git \\
+              --work-tree="$SPACK_ROOT" rev-parse $@ HEAD 2>/dev/null`"
         result="$?"
     fi
 
diff --git a/share/spack/docker/push-image.sh b/share/spack/docker/push-image.sh
deleted file mode 120000
index 9e5dfdf52d..0000000000
--- a/share/spack/docker/push-image.sh
+++ /dev/null
@@ -1 +0,0 @@
-./build-image.sh
\ No newline at end of file
diff --git a/share/spack/docker/render-image-template.sh b/share/spack/docker/render-image-template.sh
deleted file mode 120000
index 9e5dfdf52d..0000000000
--- a/share/spack/docker/render-image-template.sh
+++ /dev/null
@@ -1 +0,0 @@
-./build-image.sh
\ No newline at end of file
diff --git a/share/spack/docker/run-image.sh b/share/spack/docker/run-image.sh
deleted file mode 120000
index b3fd71be24..0000000000
--- a/share/spack/docker/run-image.sh
+++ /dev/null
@@ -1 +0,0 @@
-build-image.sh
\ No newline at end of file
diff --git a/share/spack/docker/spack_builder/Dockerfile-spack_builder_centos_7 b/share/spack/docker/spack_builder/Dockerfile-spack_builder_centos_7
deleted file mode 100644
index a10e9369be..0000000000
--- a/share/spack/docker/spack_builder/Dockerfile-spack_builder_centos_7
+++ /dev/null
@@ -1,61 +0,0 @@
-
-#
-# To build this image:
-#
-# cd <path-to-spack-repo>/share/spack/docker/spack_builder
-# docker build -f Dockerfile-spack_builder_centos_7 -t spack_builder_centos_7 .
-#
-
-from spack/centos:7
-
-RUN yum update -y          && \
-    yum install -y            \
-        gmp-devel             \
-        libmpc-devel          \
-        mpfr-devel            \
-        vim                   \
-        which              && \
-    rm -rf /var/cache/yum && yum clean all
-
-# Download, build and install gcc 5.5.0
-RUN mkdir -p /home/spackuser/Download/gcc550/build-gcc550            && \
-    mkdir -p /opt/gcc/gcc-5.5.0                                      && \
-    cd /home/spackuser/Download/gcc550                               && \
-    curl -OL https://ftp.gnu.org/gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz  && \
-    tar -xvf gcc-5.5.0.tar.xz                                        && \
-    cd build-gcc550                                                  && \
-    ../gcc-5.5.0/configure                                              \
-        --enable-languages=c,c++,fortran                                \
-        --disable-multilib                                              \
-        --prefix=/opt/gcc/gcc-5.5.0                                  && \
-    make -j$(nproc)                                                  && \
-    make install                                                     && \
-    cd /home/spackuser                                               && \
-    rm -rf /home/spackuser/Download
-
-RUN export PATH=/spack/bin:$PATH              && \
-    spack compiler find /opt/gcc/gcc-5.5.0
-
-RUN sed -i 's/f77: null/f77: \/opt\/gcc\/gcc-5.5.0\/bin\/gfortran/g;s/fc: null/fc: \/opt\/gcc\/gcc-5.5.0\/bin\/gfortran/g' ~/.spack/linux/compilers.yaml
-
-RUN mkdir -p /home/spackuser/spackcommand
-
-COPY update_rpaths.py /home/spackuser/spackcommand/update_rpaths.py
-
-RUN spack python /home/spackuser/spackcommand/update_rpaths.py  \
-        --prefix /opt/gcc/gcc-5.5.0                             \
-        --rpaths /opt/gcc/gcc-5.5.0/lib64
-
-RUN export PATH=/spack/bin:$PATH              && \
-    spack install -y llvm@6.0.0%gcc@5.5.0     && \
-    spack clean -a
-
-RUN export PATH=/spack/bin:$PATH                                     && \
-    spack compiler find $(spack location -i llvm@6.0.0%gcc@5.5.0)
-
-RUN sed -i 's/f77: null/f77: \/opt\/gcc\/gcc-5.5.0\/bin\/gfortran/g;s/fc: null/fc: \/opt\/gcc\/gcc-5.5.0\/bin\/gfortran/g' ~/.spack/linux/compilers.yaml
-
-RUN spack python /home/spackuser/spackcommand/update_rpaths.py  \
-        --prefix /spack/opt/spack/linux-centos7-x86_64/gcc-5.5.0/llvm-6.0.0-awfpo7kn3k24weu655rrt2erihzd4gii                             \
-        --rpaths /spack/opt/spack/linux-centos7-x86_64/gcc-5.5.0/llvm-6.0.0-awfpo7kn3k24weu655rrt2erihzd4gii/lib
-
diff --git a/share/spack/docker/spack_builder/Dockerfile-spack_builder_ubuntu_18.04 b/share/spack/docker/spack_builder/Dockerfile-spack_builder_ubuntu_18.04
deleted file mode 100644
index 417a11f932..0000000000
--- a/share/spack/docker/spack_builder/Dockerfile-spack_builder_ubuntu_18.04
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#
-# To build this image:
-#
-# cd <path-to-spack-repo>/share/spack/docker/spack_builder
-# docker build -f Dockerfile-spack_builder_ubuntu_18.04 -t spack_builder_ubuntu_18.04 .
-#
-
-from spack/ubuntu:bionic
-
-RUN apt-get -yqq update && apt-get -yqq install \
-        clang                                   \
-        g++-5                                   \
-        gcc-5                                   \
-        gfortran-5                              \
-        unzip                                   \
-        vim                                  && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN export PATH=/spack/bin:$PATH             && \
-    spack compiler find gcc clang
-
-RUN sed -i 's/f77: null/f77: \/usr\/bin\/gfortran/g;s/fc: null/fc: \/usr\/bin\/gfortran/g' ~/.spack/linux/compilers.yaml
diff --git a/share/spack/docker/spack_builder/update_rpaths.py b/share/spack/docker/spack_builder/update_rpaths.py
deleted file mode 100644
index 110e2f9fa6..0000000000
--- a/share/spack/docker/spack_builder/update_rpaths.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-import argparse
-from spack.config import config as spack_config
-
-
-def update_compiler(prefix, rpaths):
-    compilers_config = spack_config.get('compilers')
-
-    for compiler_entry in compilers_config:
-        if compiler_entry['compiler']['paths']['cc'].startswith(prefix):
-            print('found target compiler: {0}'.format(
-                compiler_entry['compiler']['spec']))
-            compiler_entry['compiler']['extra_rpaths'].append(rpaths)
-
-    spack_config.update_config('compilers', compilers_config)
-
-
-if __name__ == "__main__":
-    # Create argument parser
-    parser = argparse.ArgumentParser(
-        description="Add extra_rpaths to default system compilers.yaml")
-
-    parser.add_argument('-p', '--prefix', default=None,
-                        help="Install prefix of compiler to update")
-    parser.add_argument('-r', '--rpaths', default=None,
-                        help="Extra rpaths to add to target compiler")
-
-    args = parser.parse_args()
-
-    update_compiler(args.prefix, args.rpaths)
diff --git a/share/spack/docker/ubuntu-1604.dockerfile b/share/spack/docker/ubuntu-1604.dockerfile
new file mode 100644
index 0000000000..eb30ab8a8d
--- /dev/null
+++ b/share/spack/docker/ubuntu-1604.dockerfile
@@ -0,0 +1,73 @@
+FROM ubuntu:16.04
+MAINTAINER Spack Maintainers <maintainers@spack.io>
+
+ENV DOCKERFILE_BASE=ubuntu:16.04      \
+    DOCKERFILE_DISTRO=ubuntu          \
+    DOCKERFILE_DISTRO_VERSION=16.04   \
+    SPACK_ROOT=/opt/spack             \
+    FORCE_UNSAFE_CONFIGURE=1          \
+    DEBIAN_FRONTEND=noninteractive    \
+    CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
+    container=docker
+
+COPY bin   $SPACK_ROOT/bin
+COPY etc   $SPACK_ROOT/etc
+COPY lib   $SPACK_ROOT/lib
+COPY share $SPACK_ROOT/share
+COPY var   $SPACK_ROOT/var
+RUN mkdir -p $SPACK_ROOT/opt/spack
+
+RUN apt-get -yqq update                                   \
+ && apt-get -yqq install                                  \
+        build-essential ca-certificates curl       g++    \
+        gcc             gfortran        git        gnupg2 \
+        iproute2        lmod            lua-posix  make   \
+        openssh-server  python          python-pip tcl    \
+        unzip                                             \
+ && pip install boto3                                     \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN ( echo ". /usr/share/lmod/lmod/init/bash"                       \
+ &&   echo ". \$SPACK_ROOT/share/spack/setup-env.sh"                \
+ &&   echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]"  \
+ &&   echo "then"                                                   \
+ &&   echo "  . \$SPACK_ROOT/share/spack/spack-completion.bash"     \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/spack.sh                                   \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-ssh.sh\""    \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-ssh.sh             \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-ssh.sh                              \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-prompt.sh\"" \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-prompt.sh          \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-prompt.sh                           \
+ && mkdir -p /root/.spack                                           \
+ && cp $SPACK_ROOT/share/spack/docker/modules.yaml                  \
+        /root/.spack/modules.yaml                                   \
+ && rm -rf /root/*.* $SPACK_ROOT/.git
+
+# [WORKAROUND]
+# https://superuser.com/questions/1241548/
+#     xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889
+RUN [ -f ~/.profile ]                                               \
+ && sed -i 's/mesg n/( tty -s \&\& mesg n || true )/g' ~/.profile \
+ || true
+
+WORKDIR /root
+SHELL ["/bin/bash", "-l", "-c"]
+
+# TODO: add a command to Spack that (re)creates the package cache
+RUN spack spec hdf5+mpi
+
+ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
+CMD ["docker-shell"]
+
diff --git a/share/spack/docker/ubuntu-1804.dockerfile b/share/spack/docker/ubuntu-1804.dockerfile
new file mode 100644
index 0000000000..e8447b7daa
--- /dev/null
+++ b/share/spack/docker/ubuntu-1804.dockerfile
@@ -0,0 +1,76 @@
+FROM ubuntu:18.04
+MAINTAINER Spack Maintainers <maintainers@spack.io>
+
+ENV DOCKERFILE_BASE=ubuntu            \
+    DOCKERFILE_DISTRO=ubuntu          \
+    DOCKERFILE_DISTRO_VERSION=18.04   \
+    SPACK_ROOT=/opt/spack             \
+    FORCE_UNSAFE_CONFIGURE=1          \
+    DEBIAN_FRONTEND=noninteractive    \
+    CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
+    container=docker
+
+COPY bin   $SPACK_ROOT/bin
+COPY etc   $SPACK_ROOT/etc
+COPY lib   $SPACK_ROOT/lib
+COPY share $SPACK_ROOT/share
+COPY var   $SPACK_ROOT/var
+RUN mkdir -p $SPACK_ROOT/opt/spack
+
+RUN apt-get -yqq update                                   \
+ && apt-get -yqq install                                  \
+        build-essential ca-certificates curl       g++    \
+        gcc             gfortran        git        gnupg2 \
+        iproute2        lmod            lua-posix  make   \
+        openssh-server  python          python-pip tcl    \
+        unzip                                             \
+ && pip install boto3                                     \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN ( echo ". /usr/share/lmod/lmod/init/bash"                       \
+ &&   echo ". \$SPACK_ROOT/share/spack/setup-env.sh"                \
+ &&   echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]"  \
+ &&   echo "then"                                                   \
+ &&   echo "  . \$SPACK_ROOT/share/spack/spack-completion.bash"     \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/spack.sh                                   \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-ssh.sh\""    \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-ssh.sh             \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-ssh.sh                              \
+ && ( echo "f=\"\$SPACK_ROOT/share/spack/docker/handle-prompt.sh\"" \
+ &&   echo "if [ -f \"\$f\" ]"                                      \
+ &&   echo "then"                                                   \
+ &&   echo "  .  \"\$f\""                                           \
+ &&   echo "else"                                                   \
+ &&   cat  $SPACK_ROOT/share/spack/docker/handle-prompt.sh          \
+ &&   echo "fi"                                                   ) \
+       >> /etc/profile.d/handle-prompt.sh                           \
+ && mkdir -p /root/.spack                                           \
+ && cp $SPACK_ROOT/share/spack/docker/modules.yaml                  \
+        /root/.spack/modules.yaml                                   \
+ && rm -rf /root/*.* $SPACK_ROOT/.git
+
+# [WORKAROUND]
+# https://superuser.com/questions/1241548/
+#     xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889
+RUN [ -f ~/.profile ]                                               \
+ && sed -i 's/mesg n/( tty -s \&\& mesg n || true )/g' ~/.profile \
+ || true
+
+# [WORKAROUND]
+# https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
+RUN ln -s posix_c.so /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so
+
+WORKDIR /root
+SHELL ["/bin/bash", "-l", "-c"]
+
+# TODO: add a command to Spack that (re)creates the package cache
+RUN spack spec hdf5+mpi
+
+ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
+CMD ["docker-shell"]