Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions .devcontainer/cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ARG BATS_VERSION=1.11.0
ARG CCACHE_VERSION=4.11
ARG CLANG_VERSION=18
ARG CPM_VERSION=0.40.2
ARG DOCKER_VERSION=27.3.1
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.22
ARG XWIN_VERSION=0.6.5

Expand Down Expand Up @@ -32,11 +31,11 @@ RUN python3 -m pip install --break-system-packages --require-hashes --no-cache-d
&& rm -rf /tmp/requirements.txt

# Set default environment options for CMake and ccache
ENV CCACHE_DIR=/cache/.ccache
ENV CMAKE_EXPORT_COMPILE_COMMANDS="On"
ENV CMAKE_GENERATOR="Ninja"
ENV CONAN_HOME=/opt/conan
ENV CPM_SOURCE_CACHE=/cache/.cpm-cache
ENV CCACHE_DIR=/cache/.ccache \
CMAKE_EXPORT_COMPILE_COMMANDS="On" \
CMAKE_GENERATOR="Ninja" \
CONAN_HOME=/opt/conan \
CPM_SOURCE_CACHE=/cache/.cpm-cache

# Install clang toolchain and mull mutation testing framework
COPY .devcontainer/cpp/apt-requirements-clang.json /tmp/apt-requirements-clang.json
Expand All @@ -58,11 +57,6 @@ RUN mkdir /opt/gcc-arm-none-eabi \
&& 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
ENV PATH="$PATH:/opt/gcc-arm-none-eabi/bin"

# Install docker-cli for Docker-from-Docker tools
RUN wget -qO - "https://download.docker.com/linux/static/stable/$(uname -m)/docker-${DOCKER_VERSION}.tgz" | tar xz -C /tmp \
&& mv /tmp/docker/docker /usr/local/bin/ \
&& rm -rf /tmp/docker

# Install bats
RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \
&& wget -qO - https://github.com/bats-core/bats-core/archive/refs/tags/v${BATS_VERSION}.tar.gz | tar xz -C "${batstmp}" \
Expand Down
3 changes: 0 additions & 3 deletions .devcontainer/cpp/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"CONTAINER_FLAVOR": "cpp",
"NODE_EXTRA_CA_CERTS": "/usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt"
},
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
],
"features": {
"ghcr.io/devcontainers/features/desktop-lite:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
Expand Down
3 changes: 0 additions & 3 deletions .devcontainer/rust/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
"remoteEnv": {
"CONTAINER_FLAVOR": "rust"
},
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
],
"customizations": {
"vscode": {
"settings": {
Expand Down
6 changes: 0 additions & 6 deletions test/cpp/integration-tests.bats
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,6 @@ teardown() {
assert_output "Hello World!"
}

@test "when the docker socket is mounted, using the docker cli should give access to the host docker daemon" {
run docker info
assert_success
assert_output --partial "Server Version:"
}

@test "sanitizers should detect undefined or suspicious behavior in code compiled with gcc" {
build_and_run_with_sanitizers gcc
}
Expand Down
Loading