Add x86_64 arch as default (#45)

rse-ops · Oct 22, 2021 · db884b2 · db884b2
1 parent 9342cfb
commit db884b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ubuntu/16.04/Dockerfile b/ubuntu/16.04/Dockerfile
@@ -54,6 +54,7 @@ RUN apt-get update && apt-get install -y software-properties-common && \
 
 # Find packages already installed on system, e.g. autoconf
 RUN spack external find && \
+    spack config add 'packages:all:target:[x86_64]' && \
     # Install a new CMake (used to be 3.10.1)
     spack install cmake@3.20.4
 

diff --git a/ubuntu/18.04/Dockerfile b/ubuntu/18.04/Dockerfile
@@ -40,9 +40,8 @@ RUN python3 -m pip install botocore boto3 && \
 
 # Find packages already installed on system, e.g. autoconf and install cmake
 RUN spack external find && \
-    spack install cmake@3.20.4 && \
-    spack external find cmake && \
-    spack config add 'packages:cmake:buildable:False'
+    spack config add 'packages:all:target:[x86_64]' && \
+    spack install cmake@3.20.4
 
 RUN spack view --dependencies no symlink --ignore-conflicts /opt/view cmake@3.20.4
 ENV PATH=/opt/view/bin:$PATH

diff --git a/ubuntu/20.04/Dockerfile b/ubuntu/20.04/Dockerfile
@@ -47,6 +47,7 @@ RUN python3 -m pip install botocore boto3 && \
 
 # Find packages already installed on system, e.g. autoconf
 RUN spack external find && \
+    spack config add 'packages:all:target:[x86_64]' && \
     # Install a new CMake
     spack install cmake@3.20.4