summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/spack/docs/workflows.rst13
-rw-r--r--lib/spack/spack/cmd/ci.py2
-rw-r--r--share/spack/docker/centos-6.dockerfile1
-rw-r--r--share/spack/docker/centos-7.dockerfile1
-rw-r--r--share/spack/docker/ubuntu-1604.dockerfile2
-rw-r--r--share/spack/docker/ubuntu-1804.dockerfile1
-rw-r--r--share/spack/docs/docker/module-file-tutorial/Dockerfile10
-rw-r--r--var/spack/repos/builtin/packages/coreutils/package.py1
8 files changed, 8 insertions, 23 deletions
diff --git a/lib/spack/docs/workflows.rst b/lib/spack/docs/workflows.rst
index 9ce664b6ca..239ee55a6a 100644
--- a/lib/spack/docs/workflows.rst
+++ b/lib/spack/docs/workflows.rst
@@ -284,9 +284,9 @@ have some drawbacks:
The ``spack load`` and ``spack module tcl loads`` commands, on the
other hand, are not very smart: if the user-supplied spec matches
more than one installed package, then ``spack module tcl loads`` will
- fail. This default behavior may change in the future. For now,
- the workaround is to either be more specific on any failing ``spack load``
- commands or to use ``spack load --first`` to allow spack to load the
+ fail. This default behavior may change in the future. For now,
+ the workaround is to either be more specific on any failing ``spack load``
+ commands or to use ``spack load --first`` to allow spack to load the
first matching spec.
@@ -1432,10 +1432,6 @@ The following functionality is prepared:
#. Base image: the example starts from a minimal ubuntu.
-#. Installing as root: docker images are usually set up as root.
- Since some autotools scripts might complain about this being unsafe, we set
- ``FORCE_UNSAFE_CONFIGURE=1`` to avoid configure errors.
-
#. Pre-install the spack dependencies, including modules from the packages.
This avoids needing to build those from scratch via ``spack bootstrap``.
Package installs are followed by a clean-up of the system package index,
@@ -1466,8 +1462,7 @@ In order to build and run the image, execute:
# general environment for docker
ENV DEBIAN_FRONTEND=noninteractive \
- SPACK_ROOT=/usr/local \
- FORCE_UNSAFE_CONFIGURE=1
+ SPACK_ROOT=/usr/local
# install minimal spack dependencies
RUN apt-get update \
diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py
index 22c555d85a..e87da8c8af 100644
--- a/lib/spack/spack/cmd/ci.py
+++ b/lib/spack/spack/cmd/ci.py
@@ -283,8 +283,6 @@ def ci_rebuild(args):
spack_cmd = exe.which('spack')
- os.environ['FORCE_UNSAFE_CONFIGURE'] = '1'
-
cdash_report_dir = os.path.join(ci_artifact_dir, 'cdash_report')
temp_dir = os.path.join(ci_artifact_dir, 'jobs_scratch_dir')
job_log_dir = os.path.join(temp_dir, 'logs')
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
-
diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py
index c43b6a5b31..1bc3ee1e72 100644
--- a/var/spack/repos/builtin/packages/coreutils/package.py
+++ b/var/spack/repos/builtin/packages/coreutils/package.py
@@ -34,6 +34,5 @@ class Coreutils(AutotoolsPackage, GNUMirrorPackage):
configure_args.append('--program-prefix=g')
configure_args.append('--without-gmp')
configure_args.append('gl_cv_func_ftello_works=yes')
- configure_args.append('FORCE_UNSAFE_CONFIGURE=1')
return configure_args