fix archlinux docker build (#10289)
This commit is contained in:
parent
c63c4a048c
commit
c2529358f2
2 changed files with 7 additions and 8 deletions
|
@ -25,11 +25,12 @@ RUN mkdir -p $SPACK_ROOT/opt/spack
|
||||||
|
|
||||||
MASK PUSH
|
MASK PUSH
|
||||||
MASK [[ $DISTRO == arch ]]
|
MASK [[ $DISTRO == arch ]]
|
||||||
RUN pacman -Sy --noconfirm \
|
RUN pacman -Syu --noconfirm \
|
||||||
base-devel ca-certificates curl gcc \
|
&& pacman -Sy --noconfirm \
|
||||||
gcc-fortran git gnupg2 iproute2 \
|
base-devel ca-certificates curl gcc \
|
||||||
make openssh python python-pip \
|
gcc-fortran git gnupg2 inetutils \
|
||||||
sudo tcl \
|
iproute2 make openssh procps-ng \
|
||||||
|
python python-pip sudo tcl \
|
||||||
&& echo 'nobody ALL=(ALL) NOPASSWD: ALL' > \
|
&& echo 'nobody ALL=(ALL) NOPASSWD: ALL' > \
|
||||||
/etc/sudoers.d/nobody-sudo \
|
/etc/sudoers.d/nobody-sudo \
|
||||||
&& sudo -u nobody git clone \
|
&& sudo -u nobody git clone \
|
||||||
|
|
|
@ -11,8 +11,6 @@ unset BASE_TAG
|
||||||
unset TAG
|
unset TAG
|
||||||
unset EXTRA_TAGS
|
unset EXTRA_TAGS
|
||||||
|
|
||||||
export BASE_IMAGE="base/archlinux"
|
export BASE_IMAGE="archlinux/base"
|
||||||
export BASE_NAME="archlinux"
|
export BASE_NAME="archlinux"
|
||||||
export BASE_TAG="2018.10.01"
|
|
||||||
export DISTRO="arch"
|
export DISTRO="arch"
|
||||||
export EXTRA_TAGS="latest"
|
|
||||||
|
|
Loading…
Reference in a new issue