diff options
| author | Omar Padron <omar.padron@kitware.com> | 2019-01-12 03:52:50 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-01-12 00:52:50 -0800 |
| commit | c2529358f298b3a2612d7ae6b0773c9d8c2b7407 (patch) | |
| tree | e8a17ca53038bcbbf2d32236b3c5f747ae8847a5 /share | |
| parent | c63c4a048c796c900f90728c6ea11d5972cabd95 (diff) | |
| download | spack-c2529358f298b3a2612d7ae6b0773c9d8c2b7407.tar.gz spack-c2529358f298b3a2612d7ae6b0773c9d8c2b7407.tar.bz2 spack-c2529358f298b3a2612d7ae6b0773c9d8c2b7407.tar.xz spack-c2529358f298b3a2612d7ae6b0773c9d8c2b7407.zip | |
fix archlinux docker build (#10289)
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | share/spack/docker/config/arch.bash | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/share/spack/docker/Dockerfile b/share/spack/docker/Dockerfile index 7f23b25c95..3f644db302 100644 --- a/share/spack/docker/Dockerfile +++ b/share/spack/docker/Dockerfile @@ -25,11 +25,12 @@ RUN mkdir -p $SPACK_ROOT/opt/spack MASK PUSH MASK [[ $DISTRO == arch ]] -RUN pacman -Sy --noconfirm \ - base-devel ca-certificates curl gcc \ - gcc-fortran git gnupg2 iproute2 \ - make openssh python python-pip \ - sudo tcl \ +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 \ && echo 'nobody ALL=(ALL) NOPASSWD: ALL' > \ /etc/sudoers.d/nobody-sudo \ && sudo -u nobody git clone \ diff --git a/share/spack/docker/config/arch.bash b/share/spack/docker/config/arch.bash index 8078ff8251..0599b3454b 100644 --- a/share/spack/docker/config/arch.bash +++ b/share/spack/docker/config/arch.bash @@ -11,8 +11,6 @@ unset BASE_TAG unset TAG unset EXTRA_TAGS -export BASE_IMAGE="base/archlinux" +export BASE_IMAGE="archlinux/base" export BASE_NAME="archlinux" -export BASE_TAG="2018.10.01" export DISTRO="arch" -export EXTRA_TAGS="latest" |