diff --git a/docker/Dockerfile.build.ubuntu22 b/docker/Dockerfile.build.ubuntu22 index e92aecceda..6d704cc341 100644 --- a/docker/Dockerfile.build.ubuntu22 +++ b/docker/Dockerfile.build.ubuntu22 @@ -44,4 +44,7 @@ RUN /bin/sh oaienv && \ --noavx512 \ --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \ # Mainly to see if the sanitize option was perfectly executed - ldd ran_build/build/nr-softmodem + 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 diff --git a/docker/Dockerfile.eNB.ubuntu22 b/docker/Dockerfile.eNB.ubuntu22 index c57e11a2a5..af580f6258 100644 --- a/docker/Dockerfile.eNB.ubuntu22 +++ b/docker/Dockerfile.eNB.ubuntu22 @@ -52,7 +52,6 @@ RUN apt-get update && \ libboost-program-options1.74.0 \ tzdata \ libblas3 \ - libatlas3-base \ libconfig9 \ openssl \ net-tools \ @@ -111,7 +110,18 @@ COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai- RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \ ldconfig && \ - ldd /opt/oai-enb/bin/lte-softmodem + echo "---- ldd on lte-softmodem ----" && \ + ldd /opt/oai-enb/bin/lte-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/liboai_iqplayer.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_enb.so \ + /usr/local/lib/libuhd.so.4.4.0 WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.gNB.aerial.ubuntu22 b/docker/Dockerfile.gNB.aerial.ubuntu22 index f3cfe7a4be..3259e27baa 100644 --- a/docker/Dockerfile.gNB.aerial.ubuntu22 +++ b/docker/Dockerfile.gNB.aerial.ubuntu22 @@ -69,7 +69,7 @@ RUN apt-get update && \ procps \ libsctp1 \ tzdata \ - libatlas3-base \ + libblas3 \ libconfig9 \ openssl \ net-tools \ @@ -95,6 +95,14 @@ COPY --from=ran-build \ /usr/local/lib/libnvipc.so \ /usr/local/lib/ +RUN ldconfig && \ + echo "---- ldd on nr-softmodem ----" && \ + ldd /opt/oai-gnb/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libfmtlog-shared.so \ + /usr/local/lib/libnvlog.so \ + /usr/local/lib/libnvipc.so WORKDIR /opt/oai-gnb COPY --from=ran-build /tini /tini diff --git a/docker/Dockerfile.gNB.aw2s.ubuntu22 b/docker/Dockerfile.gNB.aw2s.ubuntu22 index a000d9a643..e4645a71e0 100644 --- a/docker/Dockerfile.gNB.aw2s.ubuntu22 +++ b/docker/Dockerfile.gNB.aw2s.ubuntu22 @@ -49,7 +49,7 @@ RUN apt-get update && \ libsctp1 \ tzdata \ libblas3 \ - libatlas3-base \ + libc6 \ libconfig9 \ gdb \ openssl \ @@ -78,7 +78,18 @@ COPY --from=gnb-build \ RUN /bin/bash -c "ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so" && \ /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \ - ldconfig + ldconfig && \ + echo "---- ldd on nr-softmodem ----" && \ + ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/libaw2sori_transpro.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so WORKDIR /opt/oai-gnb-aw2s diff --git a/docker/Dockerfile.gNB.ubuntu22 b/docker/Dockerfile.gNB.ubuntu22 index f039d9dce0..6ac01d7139 100644 --- a/docker/Dockerfile.gNB.ubuntu22 +++ b/docker/Dockerfile.gNB.ubuntu22 @@ -52,7 +52,6 @@ RUN apt-get update && \ libboost-program-options1.74.0 \ tzdata \ libblas3 \ - libatlas3-base \ libconfig9 \ openssl \ net-tools \ @@ -103,7 +102,19 @@ COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai- RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig && \ - ldd /opt/oai-gnb/bin/nr-softmodem + echo "---- ldd on nr-softmodem ----" && \ + ldd /opt/oai-gnb/bin/nr-softmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_ci.so \ + /usr/local/lib/libuhd.so.4.4.0 WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP diff --git a/docker/Dockerfile.lteRU.ubuntu22 b/docker/Dockerfile.lteRU.ubuntu22 index 44a7337e40..83a3e950ab 100644 --- a/docker/Dockerfile.lteRU.ubuntu22 +++ b/docker/Dockerfile.lteRU.ubuntu22 @@ -42,7 +42,6 @@ RUN apt-get update && \ procps \ software-properties-common \ libblas3 \ - libatlas3-base \ libconfig9 \ net-tools \ gdb \ @@ -83,7 +82,16 @@ COPY --from=ru-base \ /usr/lib/x86_64-linux-gnu/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig + ldconfig && \ + echo "---- ldd on oairu ----" && \ + ldd /opt/oai-lte-ru/bin/oairu && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libuhd.so.4.4.0 WORKDIR /opt/oai-lte-ru diff --git a/docker/Dockerfile.lteUE.ubuntu22 b/docker/Dockerfile.lteUE.ubuntu22 index d3d4571782..057b6d17dc 100644 --- a/docker/Dockerfile.lteUE.ubuntu22 +++ b/docker/Dockerfile.lteUE.ubuntu22 @@ -52,7 +52,7 @@ RUN apt-get update && \ libboost-program-options1.74.0 \ tzdata \ liblapacke \ - libatlas3-base \ + libblas3 \ libconfig9 \ openssl \ net-tools \ @@ -112,7 +112,17 @@ COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/o RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig && \ - ldd /opt/oai-lte-ue/bin/lte-uesoftmodem + echo "---- ldd on lte-uesoftmodem ----" && \ + ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \ + echo "---- ldd on shared librarues ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libuhd.so.4.4.0 WORKDIR /opt/oai-lte-ue COPY --from=lte-ue-base /tini /tini diff --git a/docker/Dockerfile.nrUE.ubuntu22 b/docker/Dockerfile.nrUE.ubuntu22 index 13387d2523..83aa918045 100644 --- a/docker/Dockerfile.nrUE.ubuntu22 +++ b/docker/Dockerfile.nrUE.ubuntu22 @@ -52,7 +52,7 @@ RUN apt-get update && \ libboost-program-options1.74.0 \ tzdata \ liblapacke \ - libatlas3-base \ + libblas3 \ libconfig9 \ openssl \ net-tools \ @@ -106,7 +106,20 @@ COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oa RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ ldconfig && \ - ldd /opt/oai-nr-ue/bin/nr-uesoftmodem + echo "---- ldd on nr-uesoftmodem ----" && \ + ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \ + echo "---- ldd on shared libraries ----" && \ + ldd /usr/local/lib/liboai_eth_transpro.so \ + /usr/local/lib/librfsimulator.so \ + /usr/local/lib/liboai_usrpdevif.so \ + /usr/local/lib/libcoding.so \ + /usr/local/lib/libparams_libconfig.so \ + /usr/local/lib/libdfts.so \ + /usr/local/lib/libldpc*.so \ + /usr/local/lib/libtelnetsrv.so \ + /usr/local/lib/libtelnetsrv_ciUE.so \ + /usr/local/lib/libtelnetsrv_5Gue.so \ + /usr/local/lib/libuhd.so.4.4.0 WORKDIR /opt/oai-nr-ue COPY --from=nr-ue-base /tini /tini