@@ -4,7 +4,6 @@ ARG BATS_VERSION=1.11.0
44ARG CCACHE_VERSION=4.11
55ARG CLANG_VERSION=18
66ARG CPM_VERSION=0.40.2
7- ARG DOCKER_VERSION=27.3.1
87ARG INCLUDE_WHAT_YOU_USE_VERSION=0.22
98ARG XWIN_VERSION=0.6.5
109
@@ -32,11 +31,11 @@ RUN python3 -m pip install --break-system-packages --require-hashes --no-cache-d
3231 && rm -rf /tmp/requirements.txt
3332
3433# Set default environment options for CMake and ccache
35- ENV CCACHE_DIR=/cache/.ccache
36- ENV CMAKE_EXPORT_COMPILE_COMMANDS="On"
37- ENV CMAKE_GENERATOR="Ninja"
38- ENV CONAN_HOME=/opt/conan
39- ENV CPM_SOURCE_CACHE=/cache/.cpm-cache
34+ ENV CCACHE_DIR=/cache/.ccache \
35+ CMAKE_EXPORT_COMPILE_COMMANDS="On" \
36+ CMAKE_GENERATOR="Ninja" \
37+ CONAN_HOME=/opt/conan \
38+ CPM_SOURCE_CACHE=/cache/.cpm-cache
4039
4140# Install clang toolchain and mull mutation testing framework
4241COPY .devcontainer/cpp/apt-requirements-clang.json /tmp/apt-requirements-clang.json
@@ -58,11 +57,6 @@ RUN mkdir /opt/gcc-arm-none-eabi \
5857 && wget -qO - "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-$(uname -m)-arm-none-eabi.tar.xz" | tar --exclude='*arm-none-eabi-gdb*' --exclude='share' --strip-components=1 -xJC /opt/gcc-arm-none-eabi
5958ENV PATH="$PATH:/opt/gcc-arm-none-eabi/bin"
6059
61- # Install docker-cli for Docker-from-Docker tools
62- RUN wget -qO - "https://download.docker.com/linux/static/stable/$(uname -m)/docker-${DOCKER_VERSION}.tgz" | tar xz -C /tmp \
63- && mv /tmp/docker/docker /usr/local/bin/ \
64- && rm -rf /tmp/docker
65-
6660# Install bats
6761RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \
6862 && wget -qO - https://github.com/bats-core/bats-core/archive/refs/tags/v${BATS_VERSION}.tar.gz | tar xz -C "${batstmp}" \
0 commit comments