From c102d3cd782f5e7d10c14cc6d95286ffb40eb551 Mon Sep 17 00:00:00 2001 From: laurent <laurent Thomas> Date: Thu, 8 Jun 2023 14:17:43 +0200 Subject: [PATCH] simplify ldpc lib copy in all duplicated files --- docker/Dockerfile.gNB.aw2s.rhel9 | 5 +---- docker/Dockerfile.gNB.aw2s.rocky | 19 ++----------------- docker/Dockerfile.gNB.aw2s.ubuntu20 | 5 +---- docker/Dockerfile.gNB.rhel9 | 5 +---- docker/Dockerfile.gNB.rocky | 22 +++------------------- docker/Dockerfile.gNB.ubuntu20 | 5 +---- docker/Dockerfile.nrUE.rhel9 | 5 +---- docker/Dockerfile.nrUE.rocky | 22 +++------------------- docker/Dockerfile.nrUE.ubuntu20 | 5 +---- docker/Dockerfile.phySim.rhel9 | 3 +-- 10 files changed, 15 insertions(+), 81 deletions(-) diff --git a/docker/Dockerfile.gNB.aw2s.rhel9 b/docker/Dockerfile.gNB.aw2s.rhel9 index 7e5ea8fe25..6985ab2108 100644 --- a/docker/Dockerfile.gNB.aw2s.rhel9 +++ b/docker/Dockerfile.gNB.aw2s.rhel9 @@ -67,10 +67,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /usr/local/lib/ diff --git a/docker/Dockerfile.gNB.aw2s.rocky b/docker/Dockerfile.gNB.aw2s.rocky index 8d368d1000..26eabc535f 100644 --- a/docker/Dockerfile.gNB.aw2s.rocky +++ b/docker/Dockerfile.gNB.aw2s.rocky @@ -68,10 +68,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /usr/local/lib/libori.so \ /usr/local/lib/ @@ -86,19 +83,7 @@ COPY --from=gnb-base \ RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \ ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so && \ - ldconfig && \ - echo "ldd on nr-softmodem" && ldd /opt/oai-gnb-aw2s/bin/nr-softmodem && \ - echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on libaw2sori_transpro" && ldd /usr/local/lib/libaw2sori_transpro.so && \ - echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \ - echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \ - echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \ - echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \ - echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so + ldconfig WORKDIR /opt/oai-gnb-aw2s ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.gNB.aw2s.ubuntu20 b/docker/Dockerfile.gNB.aw2s.ubuntu20 index a38cb34d78..642076163b 100644 --- a/docker/Dockerfile.gNB.aw2s.ubuntu20 +++ b/docker/Dockerfile.gNB.aw2s.ubuntu20 @@ -70,10 +70,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /usr/local/lib/ diff --git a/docker/Dockerfile.gNB.rhel9 b/docker/Dockerfile.gNB.rhel9 index d3ef5d9b64..74916d7888 100644 --- a/docker/Dockerfile.gNB.rhel9 +++ b/docker/Dockerfile.gNB.rhel9 @@ -64,10 +64,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \ /usr/local/lib/ diff --git a/docker/Dockerfile.gNB.rocky b/docker/Dockerfile.gNB.rocky index bef0094023..d6e225aa73 100644 --- a/docker/Dockerfile.gNB.rocky +++ b/docker/Dockerfile.gNB.rocky @@ -68,10 +68,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \ /usr/local/lib/ @@ -107,21 +104,8 @@ WORKDIR /usr/local/share/uhd/rfnoc COPY --from=gnb-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig && \ - echo "ldd on nr-softmodem" && ldd /opt/oai-gnb/bin/nr-softmodem && \ - echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \ - echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \ - echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \ - echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \ - echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \ - echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so && \ - echo "ldd on libtelnetsrv_ci" && ldd /usr/local/lib/libtelnetsrv_ci.so - + ldconfig + # Copy the relevant configuration files for gNB WORKDIR /opt/oai-gnb/etc COPY --from=gnb-build /oai-ran/docker/etc . diff --git a/docker/Dockerfile.gNB.ubuntu20 b/docker/Dockerfile.gNB.ubuntu20 index fe2d65dc85..f9ee719839 100644 --- a/docker/Dockerfile.gNB.ubuntu20 +++ b/docker/Dockerfile.gNB.ubuntu20 @@ -70,10 +70,7 @@ COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \ /usr/local/lib/ diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9 index 654eeef861..53b179a935 100644 --- a/docker/Dockerfile.nrUE.rhel9 +++ b/docker/Dockerfile.nrUE.rhel9 @@ -70,10 +70,7 @@ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \ /usr/local/lib/ diff --git a/docker/Dockerfile.nrUE.rocky b/docker/Dockerfile.nrUE.rocky index 072d7e5445..f0cc4b5788 100644 --- a/docker/Dockerfile.nrUE.rocky +++ b/docker/Dockerfile.nrUE.rocky @@ -75,10 +75,7 @@ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \ /usr/local/lib/ @@ -114,21 +111,8 @@ WORKDIR /usr/local/share/uhd/rfnoc COPY --from=nr-ue-base /usr/local/share/uhd/rfnoc/ . RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ - ldconfig && \ - echo "ldd on nr-uesoftmodem" && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \ - echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \ - echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \ - echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \ - echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \ - echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \ - echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \ - echo "ldd on libldpc" && ldd /usr/local/lib/libldpc.so && \ - echo "ldd on libldpc_optim" && ldd /usr/local/lib/libldpc_optim.so && \ - echo "ldd on libldpc_optim8seg" && ldd /usr/local/lib/libldpc_optim8seg.so && \ - echo "ldd on libldpc_orig" && ldd /usr/local/lib/libldpc_orig.so && \ - echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so && \ - echo "ldd on libtelnetsrv_5Gue" && ldd /usr/local/lib/libtelnetsrv_5Gue.so - + ldconfig + # Copy the relevant configuration files for eNB WORKDIR /opt/oai-nr-ue/etc COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/ue.* . diff --git a/docker/Dockerfile.nrUE.ubuntu20 b/docker/Dockerfile.nrUE.ubuntu20 index 0eb22c818f..c298394abd 100644 --- a/docker/Dockerfile.nrUE.ubuntu20 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -76,10 +76,7 @@ COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \ /usr/local/lib/ diff --git a/docker/Dockerfile.phySim.rhel9 b/docker/Dockerfile.phySim.rhel9 index 69d19bc5aa..145c3b3c2c 100644 --- a/docker/Dockerfile.phySim.rhel9 +++ b/docker/Dockerfile.phySim.rhel9 @@ -89,8 +89,7 @@ COPY --from=phy-sim-build \ /usr/lib64/libasan.so.6 \ /usr/lib64/libubsan.so.1 \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc.so \ - /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ + /oai-ran/cmake_targets/ran_build/build/libldpc*.so \ /usr/local/lib/ RUN ldconfig -- 2.26.2