Merge branch 'origin/release-2020' into master

[alexxy/gromacs.git] / admin / containers / buildall.sh

diff --git a/admin/containers/buildall.sh b/admin/containers/buildall.sh
index 1492f0f775e8df87509e397ad5d0722fc4f52c42..afc2b7166234401ea24badb5becb570f581124eb 100644 (file)
--- a/admin/containers/buildall.sh
+++ b/admin/containers/buildall.sh
@@ -45,15 +45,48 @@ tag="gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020"
 tags[${#tags[@]}]=$tag
 python3 $SCRIPT --cmake 3.15.7 --llvm 8 --opencl intel --mpi openmpi | docker build -t $tag -
 
-tag="gromacs/cmake-3.9.6-llvm-3.6-amdopencl-openmpi:2020"
+tag="gromacs/cmake-3.9.6-llvm-8-amdopencl-openmpi:2020"
 tags[${#tags[@]}]=$tag
-python3 $SCRIPT --ubuntu 16.04 --cmake 3.9.6 --llvm 3.6 --opencl amd --mpi openmpi | docker build -t $tag -
+python3 $SCRIPT --cmake 3.9.6 --llvm 8 --opencl amd --mpi openmpi | docker build -t $tag -
 
-tag=gromacs/ci-docs-llvm:2020
+tag="gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master"
 tags[${#tags[@]}]=$tag
-python3 $SCRIPT --llvm --doxygen | docker build -t $tag -
+python3 $SCRIPT --cmake 3.15.7 --gcc 8 --cuda 10.1 --opencl --clfft --mpi openmpi \
+| docker build -t $tag -
 
-tag=gromacs/ci-docs-gcc:2020
+tag="gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.13.0 --gcc 7 --opencl amd --clfft --mpi openmpi | docker build -t $tag -
+
+tag="gromacs/cmake-3.13.0-llvm-8-tsan:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.13.0 --llvm 8 --tsan | docker build -t $tag -
+
+tag="gromacs/cmake-3.15.7-llvm-8-cuda-10.0-openmpi:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.15.7 --llvm 8 --cuda 10.0 --mpi openmpi | docker build -t $tag -
+
+tag="gromacs/cmake-3.15.7-llvm-8-cuda-10.1-openmpi:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.15.7 --llvm 8 --cuda 10.1 --mpi openmpi | docker build -t $tag -
+
+tag="gromacs/cmake-3.15.7-llvm-9-openmpi:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.15.7 --llvm 9 --mpi openmpi | docker build -t $tag -
+
+tag="gromacs/cmake-3.13.0-llvm-9-intelopencl-openmpi:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.13.0 --llvm 9 --opencl intel --mpi openmpi | docker build -t $tag -
+
+tag="gromacs/cmake-3.13.0-llvm-9-amdopencl-openmpi:master"
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.13.0 --llvm 9 --opencl amd --mpi openmpi | docker build -t $tag -
+
+tag=gromacs/ci-docs-llvm:master
+tags[${#tags[@]}]=$tag
+python3 $SCRIPT --cmake 3.17.2 --llvm --doxygen | docker build -t $tag -
+
+tag=gromacs/ci-docs-gcc:master
 tags[${#tags[@]}]=$tag
 python3 $SCRIPT --gcc --doxygen | docker build -t $tag -