#2082: Update docker compose file to support seting of compiler versi…

…on for nvcc
DARMA-tasking · Mar 30, 2023 · d9dd103 · d9dd103
1 parent 5da5899
commit d9dd103
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,9 @@
 REPO=lifflander1/vt
 ARCH=amd64
-UBUNTU=18.04
+UBUNTU=20.04
 ULIMIT_CORE=0
-COMPILER=gcc-7
+COMPILER=gcc-9
+HOST_COMPILER=gcc-9
 COMPILER_TYPE=gnu
 PROXY=
 CACHE=

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -82,10 +82,11 @@ volumes:
   amd64-ubuntu-18.04-gcc-8-cache:
   amd64-ubuntu-20.04-gcc-9-cache:
   amd64-ubuntu-20.04-gcc-10-cache:
+  amd64-ubuntu-20.04-gcc-11-cache:
   amd64-ubuntu-18.04-icpx-cache:
   amd64-ubuntu-18.04-icpc-cache:
-  amd64-ubuntu-18.04-nvcc-11-cache:
-  amd64-ubuntu-18.04-nvcc-11.2-cache:
+  amd64-ubuntu-20.04-11.0.3-cache:
+  amd64-ubuntu-20.04-11.2.0-cache:
   amd64-alpine-clang-4.0-cache:
   amd64-alpine-clang-5.0-cache:
   amd64-alpine-clang-6.0-cache:
@@ -98,13 +99,14 @@ volumes:
   amd64-alpine-gcc-8-cache:
   amd64-alpine-gcc-9-cache:
   amd64-alpine-gcc-10-cache:
+  amd64-alpine-gcc-11-cache:
   amd64-alpine-icc-18-cache:
   amd64-alpine-icc-19-cache:
   amd64-alpine-icc-20-cache:
   amd64-alpine-icpx-cache:
   amd64-alpine-icpc-cache:
-  amd64-alpine-nvcc-11-cache:
-  amd64-alpine-nvcc-11.2-cache:
+  amd64-alpine-11.0.3-cache:
+  amd64-alpine-11.2.0-cache:
   arm64v8-ubuntu-18.04-gcc-7-cache:
   arm64v8-alpine-gcc-7-cache:
 
@@ -154,6 +156,7 @@ x-vtopts: &vtopts
   CODECOV_TOKEN: ${CODECOV_TOKEN:-}
   TEST_LB_SCHEMA: ${TEST_LB_SCHEMA:-0}
   CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD:-17}
+  HOST_COMPILER: ${HOST_COMPILER}
 
 services:
   ##############################################################################
@@ -172,6 +175,7 @@ services:
         arch: ${ARCH}
         proxy: ${PROXY}
         compiler: ${COMPILER}
+        host_compiler: ${HOST_COMPILER}
         ubuntu: ${UBUNTU}
         ubsan_enabled: ${VT_UBSAN:-0}
         zoltan_enabled: ${VT_ZOLTAN:-0}