diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2020-04-20 08:32:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 08:32:03 -0700 |
| commit | de13ea228407c377b6c42b54f70a17bef8be1854 (patch) | |
| tree | 6d7de576857961ef01273e702da794f250b8ad84 /share | |
| parent | e9e2d1d3cab1352e0b2dbaafb31aaaff499e6079 (diff) | |
| download | spack-de13ea228407c377b6c42b54f70a17bef8be1854.tar.gz spack-de13ea228407c377b6c42b54f70a17bef8be1854.tar.bz2 spack-de13ea228407c377b6c42b54f70a17bef8be1854.tar.xz spack-de13ea228407c377b6c42b54f70a17bef8be1854.zip | |
autotools: remove FORCE_UNSAFE_CONFIGURE from docs, commands, code (#16145)
Since #16132, we've consolidated the setting of FORCE_UNSAFE_CONFIGURE to
`autotools.py`, so we don't need to use it in packages like `coreutils`,
in our commands, or in our container recipes.
- [x] Remove FORCE_UNSAFE_CONFIGURE from packages
- [x] Remove FORCE_UNSAFE_CONFIGURE from container recipes
- [x] Remove FORCE_UNSAFE_CONFIGURE from `spack ci` command
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/docker/centos-6.dockerfile | 1 | ||||
| -rw-r--r-- | share/spack/docker/centos-7.dockerfile | 1 | ||||
| -rw-r--r-- | share/spack/docker/ubuntu-1604.dockerfile | 2 | ||||
| -rw-r--r-- | share/spack/docker/ubuntu-1804.dockerfile | 1 | ||||
| -rw-r--r-- | share/spack/docs/docker/module-file-tutorial/Dockerfile | 10 |
5 files changed, 4 insertions, 11 deletions
diff --git a/share/spack/docker/centos-6.dockerfile b/share/spack/docker/centos-6.dockerfile index d776f903da..72aa934f99 100644 --- a/share/spack/docker/centos-6.dockerfile +++ b/share/spack/docker/centos-6.dockerfile @@ -5,7 +5,6 @@ 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 diff --git a/share/spack/docker/centos-7.dockerfile b/share/spack/docker/centos-7.dockerfile index 153593a4c5..6aa969fef8 100644 --- a/share/spack/docker/centos-7.dockerfile +++ b/share/spack/docker/centos-7.dockerfile @@ -5,7 +5,6 @@ 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 diff --git a/share/spack/docker/ubuntu-1604.dockerfile b/share/spack/docker/ubuntu-1604.dockerfile index 7d57f76c7f..e7a6783d24 100644 --- a/share/spack/docker/ubuntu-1604.dockerfile +++ b/share/spack/docker/ubuntu-1604.dockerfile @@ -5,7 +5,6 @@ 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 @@ -90,4 +89,3 @@ 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 index 9b3be21bec..5950908e1e 100644 --- a/share/spack/docker/ubuntu-1804.dockerfile +++ b/share/spack/docker/ubuntu-1804.dockerfile @@ -5,7 +5,6 @@ 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 diff --git a/share/spack/docs/docker/module-file-tutorial/Dockerfile b/share/spack/docs/docker/module-file-tutorial/Dockerfile index 8dfd51bf31..9a84cf2399 100644 --- a/share/spack/docs/docker/module-file-tutorial/Dockerfile +++ b/share/spack/docs/docker/module-file-tutorial/Dockerfile @@ -2,8 +2,7 @@ FROM ubuntu:16.04 # General environment for docker ENV DEBIAN_FRONTEND=noninteractive \ - SPACK_ROOT=/usr/local \ - FORCE_UNSAFE_CONFIGURE=1 + SPACK_ROOT=/usr/local # Install system packages RUN apt-get update \ @@ -18,20 +17,20 @@ RUN apt-get update \ openmpi-bin openmpi-common libopenmpi-dev \ python \ unzip \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* # Load spack environment on login COPY spack.sh /etc/profile # Install spack RUN curl -s -L https://api.github.com/repos/spack/spack/tarball/develop \ - | tar xzC $SPACK_ROOT --strip 1 + | tar xzC $SPACK_ROOT --strip 1 # Copy configuration for external packages COPY packages.yaml $SPACK_ROOT/etc/spack/ # Build lmod -RUN spack install lmod && spack clean -a +RUN spack install lmod && spack clean -a # Build a compiler RUN spack install gcc@7.2.0 && spack clean -a @@ -48,4 +47,3 @@ RUN spack install netlib-scalapack ^openmpi ^openblas %gcc@7.2.0 \ # image run hook: the -l will make sure /etc/profile environments are loaded CMD /bin/bash -l - |