Toolchain: Add libvori to Dockerfile

cp2k · Dec 29, 2020 · 212b41d · 212b41d
1 parent ddcb84e
commit 212b41d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile
@@ -120,15 +120,19 @@ RUN ./scripts/install_gsl.sh && \
 
 COPY ./scripts/install_libvdwxc.sh \
      ./scripts/install_spglib.sh \
-     ./scripts/install_spfft.sh \
+     ./scripts/install_libvori.sh \
      ./scripts/
 RUN ./scripts/install_libvdwxc.sh && \
     ./scripts/install_spglib.sh && \
-    ./scripts/install_spfft.sh && \
+    ./scripts/install_libvori.sh && \
     rm -rf ./build
 
-COPY ./scripts/install_sirius.sh ./scripts/
-RUN ./scripts/install_sirius.sh && rm -rf ./build
+COPY ./scripts/install_spfft.sh \
+     ./scripts/install_sirius.sh \
+     ./scripts/
+RUN ./scripts/install_spfft.sh && \
+    ./scripts/install_sirius.sh && \
+    rm -rf ./build
 
 COPY ./scripts/arch_base.tmpl \
      ./scripts/generate_arch_files.sh \

diff --git a/tools/toolchain/install_cp2k_toolchain.sh b/tools/toolchain/install_cp2k_toolchain.sh
@@ -911,7 +911,6 @@ else
     ./scripts/install_valgrind.sh
     ./scripts/install_mathlibs.sh
     ./scripts/install_fftw.sh
-    ./scripts/install_spfft.sh
     ./scripts/install_libint.sh
     ./scripts/install_libxc.sh
     ./scripts/install_libsmm.sh
@@ -925,11 +924,12 @@ else
     ./scripts/install_quip.sh
     ./scripts/install_plumed.sh
     ./scripts/install_gsl.sh
-    ./scripts/install_spglib.sh
     ./scripts/install_hdf5.sh
     ./scripts/install_libvdwxc.sh
-    ./scripts/install_sirius.sh
+    ./scripts/install_spglib.sh
     ./scripts/install_libvori.sh
+    ./scripts/install_spfft.sh
+    ./scripts/install_sirius.sh
     ./scripts/generate_arch_files.sh
 fi