Commit 6f9b8824 authored by Robert Schmidt's avatar Robert Schmidt

Merge remote-tracking branch 'origin/ci-addition' into integration_2023_w50

parents fa78e135 7d2a17c0
...@@ -167,7 +167,7 @@ services: ...@@ -167,7 +167,7 @@ services:
privileged: true privileged: true
container_name: rfsim5g-oai-cu container_name: rfsim5g-oai-cu
environment: environment:
USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
ASAN_OPTIONS: detect_leaks=0 ASAN_OPTIONS: detect_leaks=0
depends_on: depends_on:
- oai-ext-dn - oai-ext-dn
......
...@@ -169,7 +169,7 @@ services: ...@@ -169,7 +169,7 @@ services:
privileged: true privileged: true
container_name: rfsim5g-oai-cucp container_name: rfsim5g-oai-cucp
environment: environment:
USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
ASAN_OPTIONS: detect_leaks=0 ASAN_OPTIONS: detect_leaks=0
depends_on: depends_on:
- oai-ext-dn - oai-ext-dn
...@@ -191,7 +191,7 @@ services: ...@@ -191,7 +191,7 @@ services:
privileged: true privileged: true
container_name: rfsim5g-oai-cuup container_name: rfsim5g-oai-cuup
environment: environment:
USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time
ASAN_OPTIONS: detect_leaks=0 ASAN_OPTIONS: detect_leaks=0
depends_on: depends_on:
- oai-cucp - oai-cucp
......
...@@ -44,6 +44,8 @@ RUN apt-get update && \ ...@@ -44,6 +44,8 @@ RUN apt-get update && \
# if the --sanitize option was used to build, additional packages are required # if the --sanitize option was used to build, additional packages are required
/bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
libasan5 \ libasan5 \
iproute2 \
net-tools \
libubsan1 \ libubsan1 \
liblapacke; fi' && \ liblapacke; fi' && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment