From a159f1b78a860e049ce6363015a0392e2019b37f Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Mon, 16 Feb 2026 11:04:11 +0100
Subject: [PATCH] Revert "Compile everything in Ubuntu builder"

This reverts commit 16c333b1a3850a79647ca2bf6387b1b14391b821.

I tried to build everything in Ubuntu images, but

- this introduced a regression (ignores $BUILD_OPTION)
- made that we don't use -Werror (when we should)

I tried to fix the use of the first, but it would involve more changes
than I prefer. On the second, we cannot enable -Werror, as FlexRIC does
not build warning-free (in Release mode). We thus have to build only the
targets that we require, and therefore we can keep using build_oai,
which is the simplest option (cf. the first point).
---
 docker/Dockerfile.build.ubuntu | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile.build.ubuntu b/docker/Dockerfile.build.ubuntu
index bc2ed577a6..2fb391c9cf 100644
--- a/docker/Dockerfile.build.ubuntu
+++ b/docker/Dockerfile.build.ubuntu
@@ -42,15 +42,22 @@ RUN \
    # Mount CPM package cache
    --mount=type=cache,target=/root/.cache/cpm/ \
     /bin/sh oaienv && \
-    mkdir -p cmake_targets/ran_build/build && \
-    cd cmake_targets/ran_build/build && \
-    cmake ../../../ -GNinja \
-        -DENABLE_TELNETSRV=ON -DENABLE_ENBSCOPE=ON -DENABLE_UESCOPE=ON -DENABLE_NRSCOPE=ON \
-        -DOAI_USRP=ON -DOAI_BLADERF=ON -DOAI_ETHERNET=ON -DOAI_VRTSIM_TAPS_CLIENT=ON \
-        -DE2_AGENT=ON -DKPM_VERSION=KPM_V3_00 -DE2AP_VERSION=E2AP_V3 \
-        -DAVX512=OFF && \
-    # -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror && \
-    ninja
+    cd cmake_targets && \
+    mkdir -p log && \
+    ./build_oai -c --ninja \
+      --eNB --gNB --RU --UE --nrUE \
+      --build-lib "telnetsrv enbscope uescope nrscope" \
+      -w USRP -t Ethernet -w BLADERF \
+      --build-e2 --cmake-opt -DKPM_VERSION=$KPM_VERSION --cmake-opt -DE2AP_VERSION=$E2AP_VERSION \
+      --cmake-opt -DOAI_VRTSIM_TAPS_CLIENT=ON \
+      --noavx512 \
+      --build-tool-opt -k10 \
+      --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
+    # Mainly to see if the sanitize option was perfectly executed
+    echo "---- ldd on executables ----" && \
+    ldd ran_build/build/*softmodem* ran_build/build/nr-cuup ran_build/build/oairu && \
+    echo "---- ldd on shared libraries ----" && \
+    ldd ran_build/build/*.so
 
 ## Build FlexRIC for SM Models
 RUN \