diff options
| author | Omar Padron <omar.padron@kitware.com> | 2019-03-25 21:10:42 -0400 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-03-25 20:10:42 -0500 |
| commit | 57523c3f0b1309fe355f1675b00f0bd0ab584e88 (patch) | |
| tree | 4374d7840bec1a76305a42b6e9b8ffe6213b2f2d /share/spack/docker | |
| parent | 17da285cfbf3b52ebddc817b22b90341aef462c0 (diff) | |
| download | spack-57523c3f0b1309fe355f1675b00f0bd0ab584e88.tar.gz spack-57523c3f0b1309fe355f1675b00f0bd0ab584e88.tar.bz2 spack-57523c3f0b1309fe355f1675b00f0bd0ab584e88.tar.xz spack-57523c3f0b1309fe355f1675b00f0bd0ab584e88.zip | |
explicitly install unzip in all docker images (#10891)
Diffstat (limited to 'share/spack/docker')
| -rw-r--r-- | share/spack/docker/Dockerfile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/share/spack/docker/Dockerfile b/share/spack/docker/Dockerfile index 3417f9ab16..824403f2d2 100644 --- a/share/spack/docker/Dockerfile +++ b/share/spack/docker/Dockerfile @@ -31,6 +31,7 @@ RUN pacman -Syu --noconfirm \ 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 \ @@ -69,10 +70,11 @@ 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 \ + 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 @@ -84,7 +86,7 @@ RUN dnf update -y \ curl findutils gcc-c++ gcc \ gcc-gfortran git gnupg2 hostname \ iproute Lmod make patch \ - openssh-server python tcl \ + openssh-server python tcl unzip \ && dnf clean all MASK [[ $DISTRO == opensuse ]] @@ -98,7 +100,7 @@ RUN zypper -n ref \ gcc-fortran git glibc-locale gpg2 \ hostname iproute lua-lmod make \ patch openssh python python-pip \ - python-xml tcl \ + python-xml tcl unzip \ && zypper clean \ && rm -rf /var/cache/zypp/* @@ -108,7 +110,8 @@ RUN apt-get -yqq update \ build-essential ca-certificates curl g++ \ gcc gfortran git gnupg2 \ iproute2 lmod lua-posix make \ - openssh-server python python-pip tcl + openssh-server python python-pip tcl \ + unzip MASK PUSH MASK [[ $DISTRO_VERSION == 18.04 ]] |