Skip to content

Commit

Permalink
#2121: Generalize names of named volumes
Browse files Browse the repository at this point in the history
  • Loading branch information
thearusable committed Nov 13, 2023
1 parent 65e7ebc commit 4cd6967
Showing 1 changed file with 7 additions and 56 deletions.
63 changes: 7 additions & 56 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,61 +65,12 @@
# Need verision >= 3.5 for the features in use
version: '3.8'

# Named volumes must be predefined according the docker compose rules. Many
# combinations have already been added, but if a needed configuration is missing
# add it to this list. For example, for ARM64v8 on Ubuntu 20.04 with clang-9,
# add `arm64v8-ubuntu-20.04-clang-9-clang-9-cache`.
# Volume will be created automatically for each combination of parameters.
volumes:
amd64-ubuntu-18.04-clang-8-clang-8-cache:
amd64-ubuntu-18.04-clang-9-clang-9-cache:
amd64-ubuntu-20.04-clang-10-clang-10-cache:
amd64-ubuntu-22.04-clang-11-clang-11-cache:
amd64-ubuntu-18.04-gcc-8-gcc-8-cache:
amd64-ubuntu-20.04-gcc-9-gcc-9-cache:
amd64-ubuntu-20.04-gcc-10-gcc-10-cache:
amd64-ubuntu-22.04-gcc-12-gcc-12-cache:
amd64-ubuntu-18.04-icpx-icpx-cache:
amd64-ubuntu-18.04-icpc-icpc-cache:
amd64-ubuntu-20.04-gcc-9-11.0.3-cache:
amd64-ubuntu-20.04-gcc-9-11.2.0-cache:
amd64-alpine-clang-8-clang-8-cache:
amd64-alpine-clang-9-clang-9-cache:
amd64-alpine-clang-10-clang-10-cache:
amd64-alpine-clang-11-clang-11-cache:
amd64-alpine-clang-13-clang-13-cache:
amd64-alpine-gcc-8-gcc-8-cache:
amd64-alpine-gcc-9-gcc-9-cache:
amd64-alpine-gcc-10-gcc-10-cache:
amd64-alpine-gcc-12-gcc-12-cache:
amd64-alpine-icpx-icpx-cache:
amd64-alpine-icpc-icpc-cache:
amd64-alpine-gcc-9-11.0.3-cache:
amd64-alpine-gcc-9-11.2.0-cache:
arm64v8-ubuntu-18.04-clang-8-clang-8-cache:
arm64v8-ubuntu-18.04-clang-9-clang-9-cache:
arm64v8-ubuntu-20.04-clang-10-clang-10-cache:
arm64v8-ubuntu-22.04-clang-11-clang-11-cache:
arm64v8-ubuntu-18.04-gcc-8-gcc-8-cache:
arm64v8-ubuntu-20.04-gcc-9-gcc-9-cache:
arm64v8-ubuntu-20.04-gcc-10-gcc-10-cache:
arm64v8-ubuntu-22.04-gcc-12-gcc-12-cache:
arm64v8-ubuntu-18.04-icpx-icpx-cache:
arm64v8-ubuntu-18.04-icpc-icpc-cache:
arm64v8-ubuntu-20.04-gcc-9-11.0.3-cache:
arm64v8-ubuntu-20.04-gcc-9-11.2.0-cache:
arm64v8-alpine-clang-8-clang-8-cache:
arm64v8-alpine-clang-9-clang-9-cache:
arm64v8-alpine-clang-10-clang-10-cache:
arm64v8-alpine-clang-11-clang-11-cache:
arm64v8-alpine-clang-13-clang-13-cache:
arm64v8-alpine-gcc-8-gcc-8-cache:
arm64v8-alpine-gcc-9-gcc-9-cache:
arm64v8-alpine-gcc-10-gcc-10-cache:
arm64v8-alpine-gcc-12-gcc-12-cache:
arm64v8-alpine-icpx-icpx-cache:
arm64v8-alpine-icpc-icpc-cache:
arm64v8-alpine-gcc-9-11.0.3-cache:
arm64v8-alpine-gcc-9-11.2.0-cache:
ubuntu-cpp:
name: ${CACHE}${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache
alpine-cpp:
name: ${CACHE}${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-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 @@ -195,7 +146,7 @@ services:
<<: [*ccache, *vtopts]
volumes: &ubuntu-volumes
- .:/vt:delegated
- ${CACHE}${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache:/build:delegated
- ubuntu-cpp:/build:delegated
command: &vt-cpp-command >
/bin/bash -c "
/vt/ci/build_cpp.sh /vt /build &&
Expand Down Expand Up @@ -425,7 +376,7 @@ services:
<<: [*ccache, *vtopts]
volumes: &alpine-volumes
- .:/vt:delegated
- ${CACHE}${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cache:/build:delegated
- alpine-cpp:/build:delegated
command: *vt-cpp-command

##############################################################################
Expand Down

0 comments on commit 4cd6967

Please sign in to comment.