From c2529358f298b3a2612d7ae6b0773c9d8c2b7407 Mon Sep 17 00:00:00 2001 From: Omar Padron Date: Sat, 12 Jan 2019 03:52:50 -0500 Subject: fix archlinux docker build (#10289) --- share/spack/docker/Dockerfile | 11 ++++++----- share/spack/docker/config/arch.bash | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'share') 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" -- cgit v1.2.3-60-g2f50