diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index 8e2462487e..c7abef6604 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -488,7 +488,7 @@ function main() { [ "$CLEAN" = "1" ] && rm -rf $DIR/$BUILD_DIR/build - if [[ $TARGET_LIST != "" ]]; then + if [[ $TARGET_LIST != "" ]] && [[ -f $OPENAIR_DIR/CMakeLists.txt ]]; then # add some default libraries that should always be built # for eNB, gNB, UEs, simulators if [[ $gNB == 1 || $eNB == 1 || $UE == 1 || $nrUE == 1 || $SIMUS_PHY == 1 || $RU == 1 ]]; then diff --git a/docker/Dockerfile.base.rhel9 b/docker/Dockerfile.base.rhel9 index 7142b721fa..1fc3fa973f 100644 --- a/docker/Dockerfile.base.rhel9 +++ b/docker/Dockerfile.base.rhel9 @@ -67,9 +67,17 @@ RUN chmod +x /tini # In some network environments, GIT proxy is required RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi" -#create the WORKDIR +# Copying only the needed files to create ran-base +WORKDIR /oai-ran/cmake_targets/tools +COPY cmake_targets/tools/build_helper \ + cmake_targets/tools/uhd-4.x-tdd-patch.diff \ + ./ + +WORKDIR /oai-ran/cmake_targets +COPY cmake_targets/build_oai . + WORKDIR /oai-ran -COPY . . +COPY oaienv . #run build_oai -I to get the builder image RUN /bin/sh oaienv && \ diff --git a/docker/Dockerfile.base.rocky b/docker/Dockerfile.base.rocky index 41210177b8..5b5debd862 100644 --- a/docker/Dockerfile.base.rocky +++ b/docker/Dockerfile.base.rocky @@ -52,9 +52,17 @@ ENV TINI_VERSION v0.19.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini -#create the WORKDIR +# Copying only the needed files to create ran-base +WORKDIR /oai-ran/cmake_targets/tools +COPY cmake_targets/tools/build_helper \ + cmake_targets/tools/uhd-4.x-tdd-patch.diff \ + ./ + +WORKDIR /oai-ran/cmake_targets +COPY cmake_targets/build_oai . + WORKDIR /oai-ran -COPY . . +COPY oaienv . #run build_oai -I to get the builder image RUN /bin/sh oaienv && \ diff --git a/docker/Dockerfile.base.ubuntu20 b/docker/Dockerfile.base.ubuntu20 index 3434bdaa4b..5687e21ac2 100644 --- a/docker/Dockerfile.base.ubuntu20 +++ b/docker/Dockerfile.base.ubuntu20 @@ -55,9 +55,17 @@ RUN chmod +x /tini # In some network environments, GIT proxy is required RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi" -#create the WORKDIR +# Copying only the needed files to create ran-base +WORKDIR /oai-ran/cmake_targets/tools +COPY cmake_targets/tools/build_helper \ + cmake_targets/tools/uhd-4.x-tdd-patch.diff \ + ./ + +WORKDIR /oai-ran/cmake_targets +COPY cmake_targets/build_oai . + WORKDIR /oai-ran -COPY . . +COPY oaienv . #run build_oai -I to get the builder image RUN /bin/sh oaienv && \ diff --git a/docker/Dockerfile.base.ubuntu20.cross-arm64 b/docker/Dockerfile.base.ubuntu20.cross-arm64 index bdd6c41774..70b790ba4d 100644 --- a/docker/Dockerfile.base.ubuntu20.cross-arm64 +++ b/docker/Dockerfile.base.ubuntu20.cross-arm64 @@ -79,9 +79,17 @@ ENV TINI_VERSION v0.19.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini RUN chmod +x /tini -# create the WORKDIR +# Copying only the needed files to create ran-base +WORKDIR /oai-ran/cmake_targets/tools +COPY cmake_targets/tools/build_helper \ + cmake_targets/tools/uhd-4.x-tdd-patch.diff \ + ./ + +WORKDIR /oai-ran/cmake_targets +COPY cmake_targets/build_oai . + WORKDIR /oai-ran -COPY . . +COPY oaienv . #run build_oai -I to get the builder image RUN /bin/sh oaienv && \ diff --git a/docker/Dockerfile.eNB.ubuntu20 b/docker/Dockerfile.eNB.ubuntu20 index cecd343295..8822349c0b 100644 --- a/docker/Dockerfile.eNB.ubuntu20 +++ b/docker/Dockerfile.eNB.ubuntu20 @@ -40,9 +40,17 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes \ software-properties-common \ - tzdata \ procps \ libsctp1 \ + libboost-chrono1.71.0 \ + libboost-date-time1.71.0 \ + libboost-filesystem1.71.0 \ + libboost-regex1.71.0 \ + libboost-serialization1.71.0 \ + libboost-thread1.71.0 \ + libboost-system1.71.0 \ + libboost-program-options1.71.0 \ + tzdata \ libblas3 \ libatlas3-base \ libconfig9 \ @@ -63,6 +71,7 @@ RUN apt-get update && \ libasan5 \ libubsan1 \ liblapacke; fi' && \ + apt-get clean -y && \ rm -rf /var/lib/apt/lists/* WORKDIR /opt/oai-enb/bin @@ -86,16 +95,6 @@ COPY --from=enb-build \ COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=enb-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin -COPY --from=enb-base \ - /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/ 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" && \ diff --git a/docker/Dockerfile.gNB.ubuntu20 b/docker/Dockerfile.gNB.ubuntu20 index 5eb5f8557a..dc24bb7636 100644 --- a/docker/Dockerfile.gNB.ubuntu20 +++ b/docker/Dockerfile.gNB.ubuntu20 @@ -34,7 +34,7 @@ FROM ran-build:latest AS gnb-build FROM ubuntu:focal as oai-gnb ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe +ENV TZ=Europe/Paris RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ @@ -42,6 +42,14 @@ RUN apt-get update && \ software-properties-common \ procps \ libsctp1 \ + libboost-chrono1.71.0 \ + libboost-date-time1.71.0 \ + libboost-filesystem1.71.0 \ + libboost-regex1.71.0 \ + libboost-serialization1.71.0 \ + libboost-thread1.71.0 \ + libboost-system1.71.0 \ + libboost-program-options1.71.0 \ tzdata \ libblas3 \ libatlas3-base \ @@ -63,6 +71,7 @@ RUN apt-get update && \ libasan5 \ libubsan1 \ liblapacke; fi' && \ + apt-get clean -y && \ rm -rf /var/lib/apt/lists/* WORKDIR /opt/oai-gnb/bin @@ -86,16 +95,6 @@ COPY --from=gnb-build \ COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=gnb-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin -COPY --from=gnb-base \ - /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ - /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 && \ diff --git a/docker/Dockerfile.lteUE.ubuntu20 b/docker/Dockerfile.lteUE.ubuntu20 index 4a81ed062b..12652c3141 100644 --- a/docker/Dockerfile.lteUE.ubuntu20 +++ b/docker/Dockerfile.lteUE.ubuntu20 @@ -40,9 +40,17 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes \ software-properties-common \ - tzdata \ procps \ libsctp1 \ + libboost-chrono1.71.0 \ + libboost-date-time1.71.0 \ + libboost-filesystem1.71.0 \ + libboost-regex1.71.0 \ + libboost-serialization1.71.0 \ + libboost-thread1.71.0 \ + libboost-system1.71.0 \ + libboost-program-options1.71.0 \ + tzdata \ liblapacke \ libatlas3-base \ libconfig9 \ @@ -63,6 +71,7 @@ RUN apt-get update && \ libasan5 \ libubsan1 \ liblapacke; fi' && \ + apt-get clean -y && \ rm -rf /var/lib/apt/lists/* WORKDIR /opt/oai-lte-ue/bin @@ -89,17 +98,6 @@ COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=lte-ue-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin -COPY --from=lte-ue-base \ - /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ - /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 && \ ldd /opt/oai-lte-ue/bin/lte-uesoftmodem diff --git a/docker/Dockerfile.nrUE.ubuntu20 b/docker/Dockerfile.nrUE.ubuntu20 index 8f9bbfb33c..e6f8d45e53 100644 --- a/docker/Dockerfile.nrUE.ubuntu20 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -40,8 +40,16 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes \ software-properties-common \ - libsctp1 \ procps \ + libsctp1 \ + libboost-chrono1.71.0 \ + libboost-date-time1.71.0 \ + libboost-filesystem1.71.0 \ + libboost-regex1.71.0 \ + libboost-serialization1.71.0 \ + libboost-thread1.71.0 \ + libboost-system1.71.0 \ + libboost-program-options1.71.0 \ tzdata \ liblapacke \ libatlas3-base \ @@ -62,6 +70,7 @@ RUN apt-get update && \ /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ libasan5 \ libubsan1; fi' && \ + apt-get clean -y && \ rm -rf /var/lib/apt/lists/* WORKDIR /opt/oai-nr-ue/bin @@ -89,17 +98,6 @@ COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=nr-ue-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin -COPY --from=nr-ue-base \ - /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ - /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 && \ ldd /opt/oai-nr-ue/bin/nr-uesoftmodem