Skip to content

Commit

Permalink
#2082: Update docker compose file to support seting of compiler versi…
Browse files Browse the repository at this point in the history
…on for nvcc
  • Loading branch information
thearusable committed May 4, 2023
1 parent 113e8cf commit 7041688
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
REPO=lifflander1/vt
ARCH=amd64
UBUNTU=22.04
UBUNTU=20.04
ULIMIT_CORE=0
COMPILER=gcc-12
COMPILER=gcc-9
HOST_COMPILER=gcc-9
COMPILER_TYPE=gnu
PROXY=
CACHE=
Expand Down
23 changes: 17 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,15 @@ volumes:
amd64-ubuntu-18.04-gcc-8-cache:
amd64-ubuntu-20.04-gcc-9-cache:
amd64-ubuntu-20.04-gcc-10-cache:
amd64-ubuntu-22.04-gcc-12-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:
amd64-alpine-clang-7-cache:
amd64-alpine-clang-8-cache:
amd64-alpine-clang-9-cache:
amd64-alpine-clang-10-cache:
Expand All @@ -89,11 +93,16 @@ volumes:
amd64-alpine-gcc-8-cache:
amd64-alpine-gcc-9-cache:
amd64-alpine-gcc-10-cache:
amd64-alpine-gcc-12-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:

# Define basic rules for ccache used across multiple services. The beauty of
# docker compose with cached volumes is that similarly configured builds will
Expand Down Expand Up @@ -141,6 +150,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:
##############################################################################
Expand All @@ -159,6 +169,7 @@ services:
arch: ${ARCH}
proxy: ${PROXY}
compiler: ${COMPILER}
host_compiler: ${HOST_COMPILER}
ubuntu: ${UBUNTU}
ubsan_enabled: ${VT_UBSAN:-0}
zoltan_enabled: ${VT_ZOLTAN:-0}
Expand Down

0 comments on commit 7041688

Please sign in to comment.