diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 630942b7f9..8d4175fe24 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -187,7 +187,7 @@ def AnalyzeIperf(cliOptions, clientReport, serverReport): reportLine = clientReportLines[l+1] logging.debug(f'found server report: "{reportLine}"') - statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P[0-9\.]+) (?P[kKMG])bits\/sec +(?P[0-9\.]+) ms +(\d+\/ ..\d+) +(\((?P[0-9\.]+)%\))' + statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P[0-9\.]+) (?P[kKMG])bits\/sec +(?P[0-9\.]+) ms +(\d+\/ *\d+) +(\((?P[0-9\.]+)%\))' # if we do not find a server report in the client logs, check the server logs # and use the last line which is typically close/identical to server report if reportLine is None: @@ -345,7 +345,7 @@ class Containerize(): self.host = result.group(0) if self.host == 'Ubuntu': self.cli = 'docker' - self.dockerfileprefix = '.ubuntu18' + self.dockerfileprefix = '.ubuntu20' self.cliBuildOptions = '--no-cache' elif self.host == 'Red Hat': self.cli = 'sudo podman' diff --git a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml index 546211e5b3..e861db2511 100644 --- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: l2sim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml index 18f929a6e8..9ca81f6d52 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml index 3f9d764f3a..892d52b5c9 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml index 6cf8ee2677..921030d263 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml index b3182ba23b..51e967ca4c 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index a364a1db95..1fe8089304 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index 42d67b0bdc..451b1e5ca9 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md index eb8e58d415..48081e71dd 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md @@ -37,7 +37,7 @@ $ docker pull oaisoftwarealliance/oai-amf:v1.5.0 $ docker pull oaisoftwarealliance/oai-nrf:v1.5.0 $ docker pull oaisoftwarealliance/oai-smf:v1.5.0 $ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 -$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest +$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal $ docker pull oaisoftwarealliance/oai-gnb:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml index 3af3bc60cf..ee6c54994d 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: "l2sim-oai-ext-dn" - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_rfsimulator/README.md b/ci-scripts/yaml_files/5g_rfsimulator/README.md index 1e2cb638eb..e82f8bed39 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/README.md +++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md @@ -41,7 +41,7 @@ $ docker pull oaisoftwarealliance/oai-amf:v1.5.0 $ docker pull oaisoftwarealliance/oai-nrf:v1.5.0 $ docker pull oaisoftwarealliance/oai-smf:v1.5.0 $ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 -$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest +$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal $ docker pull oaisoftwarealliance/oai-gnb:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index bc271e0643..80ef1d6327 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index a298c21748..4c85f643f8 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index d33738e2f7..14f76b20b3 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 7abfb7b915..8ae56ac277 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -149,7 +149,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.73.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index e6e525389b..f47698f7ca 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -148,7 +148,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:latest + image: oaisoftwarealliance/trf-gen-cn5g:focal entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" diff --git a/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml index 91d15b5251..5ed5d8777c 100644 --- a/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml +++ b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml @@ -184,7 +184,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: prod-trf-gen networks: diff --git a/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml b/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml index f320e7e3df..a7771de6eb 100644 --- a/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml +++ b/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml @@ -168,7 +168,7 @@ services: retries: 5 trf_gen: - image: trf-gen:production + image: oaisoftwarealliance/trf-gen-cn5g:focal privileged: true container_name: prod-trf-gen networks: diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 4c951890d9..d2dc1696bf 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -274,6 +274,7 @@ install_usrp_uhd_driver_from_source(){ # - 4.2.0.0 # - 4.2.0.1 # - 4.3.0.0-rc1 + # - 4.4.0.0 git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch" fi @@ -349,7 +350,7 @@ check_install_usrp_uhd_driver(){ $SUDO apt-get -y install python-tk $boost_libs_ubuntu libusb-1.0-0-dev case "$(get_distribution_release)" in "ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04") - $SUDO apt-get -y install libuhd-dev libuhd4.2.0 uhd-host + $SUDO apt-get -y install libuhd-dev libuhd4.4.0 uhd-host ;; esac elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then diff --git a/docker/Dockerfile.base.rhel8.2 b/docker/Dockerfile.base.rhel8.2 index 17a559379d..dd0d4c0e43 100644 --- a/docker/Dockerfile.base.rhel8.2 +++ b/docker/Dockerfile.base.rhel8.2 @@ -30,7 +30,7 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ran-base ARG NEEDED_GIT_PROXY ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True -ENV UHD_VERSION=3.15.0.0 +ENV UHD_VERSION=4.4.0.0 # Copy the entitlements COPY ./etc-pki-entitlement /etc/pki/entitlement diff --git a/docker/Dockerfile.base.ubuntu18 b/docker/Dockerfile.base.ubuntu20 similarity index 96% rename from docker/Dockerfile.base.ubuntu18 rename to docker/Dockerfile.base.ubuntu20 index 7cf2ecceaa..73fe0905d9 100644 --- a/docker/Dockerfile.base.ubuntu18 +++ b/docker/Dockerfile.base.ubuntu20 @@ -21,17 +21,17 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- -FROM ubuntu:bionic AS ran-base +FROM ubuntu:focal AS ran-base ARG NEEDED_GIT_PROXY ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris ENV BUILD_UHD_FROM_SOURCE=True -ENV UHD_VERSION=3.15.0.0 +ENV UHD_VERSION=4.4.0.0 #install developers pkg/repo RUN apt-get update && \ diff --git a/docker/Dockerfile.build.rhel8.2 b/docker/Dockerfile.build.rhel8.2 index 4978c0c50d..c7f111a01d 100644 --- a/docker/Dockerfile.build.rhel8.2 +++ b/docker/Dockerfile.build.rhel8.2 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for RHEL8 # #--------------------------------------------------------------------- diff --git a/docker/Dockerfile.build.ubuntu18 b/docker/Dockerfile.build.ubuntu20 similarity index 98% rename from docker/Dockerfile.build.ubuntu18 rename to docker/Dockerfile.build.ubuntu20 index 62c3b84c10..cc8d4babb2 100644 --- a/docker/Dockerfile.build.ubuntu18 +++ b/docker/Dockerfile.build.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- diff --git a/docker/Dockerfile.eNB.rhel8.2 b/docker/Dockerfile.eNB.rhel8.2 index 8d9f3098d5..f52f6d9566 100644 --- a/docker/Dockerfile.eNB.rhel8.2 +++ b/docker/Dockerfile.eNB.rhel8.2 @@ -95,7 +95,7 @@ COPY --from=enb-base \ # Now we are copying from builder-image the UHD files. COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=enb-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64 +COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin WORKDIR /usr/local/share/uhd/rfnoc diff --git a/docker/Dockerfile.eNB.ubuntu18 b/docker/Dockerfile.eNB.ubuntu20 similarity index 86% rename from docker/Dockerfile.eNB.ubuntu18 rename to docker/Dockerfile.eNB.ubuntu20 index 1c85eb1232..86f9569a30 100644 --- a/docker/Dockerfile.eNB.ubuntu18 +++ b/docker/Dockerfile.eNB.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-enb +FROM ubuntu:focal as oai-enb ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -81,16 +81,17 @@ COPY --from=enb-build \ # Now we are copying from builder-image the UHD files. COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=enb-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib +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_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /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" && \ diff --git a/docker/Dockerfile.gNB.rhel8.2 b/docker/Dockerfile.gNB.rhel8.2 index bb034dc099..9af0812cd6 100644 --- a/docker/Dockerfile.gNB.rhel8.2 +++ b/docker/Dockerfile.gNB.rhel8.2 @@ -99,7 +99,7 @@ COPY --from=gnb-base \ # Now we are copying from builder-image the UHD files. COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=gnb-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64 +COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin WORKDIR /usr/local/share/uhd/rfnoc diff --git a/docker/Dockerfile.gNB.ubuntu18 b/docker/Dockerfile.gNB.ubuntu20 similarity index 86% rename from docker/Dockerfile.gNB.ubuntu18 rename to docker/Dockerfile.gNB.ubuntu20 index 681dd9d3d7..f2d89a406e 100644 --- a/docker/Dockerfile.gNB.ubuntu18 +++ b/docker/Dockerfile.gNB.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu18.04 +# Valid for Ubuntu20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-gnb +FROM ubuntu:focal as oai-gnb ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe @@ -82,16 +82,17 @@ COPY --from=gnb-build \ # Now we are copying from builder-image the UHD files. COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=gnb-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib +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_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /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" && \ diff --git a/docker/Dockerfile.lteRU.rhel8.2 b/docker/Dockerfile.lteRU.rhel8.2 index 338a15c9cf..b4d53f367b 100644 --- a/docker/Dockerfile.lteRU.rhel8.2 +++ b/docker/Dockerfile.lteRU.rhel8.2 @@ -86,7 +86,7 @@ COPY --from=ru-base \ # Copying from the ran-build image the USRP needed packages COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=ru-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64 +COPY --from=ru-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin WORKDIR /usr/local/share/uhd/rfnoc diff --git a/docker/Dockerfile.lteRU.ubuntu18 b/docker/Dockerfile.lteRU.ubuntu20 similarity index 85% rename from docker/Dockerfile.lteRU.ubuntu18 rename to docker/Dockerfile.lteRU.ubuntu20 index 88fbc59bbb..51eac941f7 100644 --- a/docker/Dockerfile.lteRU.ubuntu18 +++ b/docker/Dockerfile.lteRU.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters cp /oai-ran/docker/scripts/lte_ru_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-lte-ru +FROM ubuntu:focal as oai-lte-ru ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -73,16 +73,17 @@ COPY --from=ru-build \ # Now we are copying from builder-image the UHD files. COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=ru-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib +COPY --from=ru-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib COPY --from=ru-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin COPY --from=ru-base \ - /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ + /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/ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ diff --git a/docker/Dockerfile.lteUE.rhel8.2 b/docker/Dockerfile.lteUE.rhel8.2 index e86d3d97b8..3bbcbb5d4b 100644 --- a/docker/Dockerfile.lteUE.rhel8.2 +++ b/docker/Dockerfile.lteUE.rhel8.2 @@ -96,7 +96,7 @@ COPY --from=lte-ue-base \ # Now we are copying from builder-image the UHD files. COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64 +COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin WORKDIR /usr/local/share/uhd/rfnoc diff --git a/docker/Dockerfile.lteUE.ubuntu18 b/docker/Dockerfile.lteUE.ubuntu20 similarity index 85% rename from docker/Dockerfile.lteUE.ubuntu18 rename to docker/Dockerfile.lteUE.ubuntu20 index 4175bab297..06e2d0c669 100644 --- a/docker/Dockerfile.lteUE.ubuntu18 +++ b/docker/Dockerfile.lteUE.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu18.04 +# Valid for Ubuntu20.04 # #--------------------------------------------------------------------- @@ -34,7 +34,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_paramet cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-lte-ue +FROM ubuntu:focal as oai-lte-ue ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -81,17 +81,18 @@ COPY --from=lte-ue-build \ # Now we are copying from builder-image the UHD files. COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=lte-ue-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib +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_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /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" && \ diff --git a/docker/Dockerfile.nr-cuup.ubuntu18 b/docker/Dockerfile.nr-cuup.ubuntu20 similarity index 97% rename from docker/Dockerfile.nr-cuup.ubuntu18 rename to docker/Dockerfile.nr-cuup.ubuntu20 index 94d1ff5ef7..e836d87fef 100644 --- a/docker/Dockerfile.nr-cuup.ubuntu18 +++ b/docker/Dockerfile.nr-cuup.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu18.04 +# Valid for Ubuntu20.04 # #--------------------------------------------------------------------- @@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh -FROM ubuntu:bionic as oai-nr-cuup +FROM ubuntu:focal as oai-nr-cuup ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe diff --git a/docker/Dockerfile.nrUE.rhel8.2 b/docker/Dockerfile.nrUE.rhel8.2 index 9fc3826a6d..6242eb4c91 100644 --- a/docker/Dockerfile.nrUE.rhel8.2 +++ b/docker/Dockerfile.nrUE.rhel8.2 @@ -106,7 +106,7 @@ COPY --from=nr-ue-base \ # Now we are copying from builder-image the UHD files. COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.3.15.0 /usr/local/lib64 +COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin WORKDIR /usr/local/share/uhd/rfnoc diff --git a/docker/Dockerfile.nrUE.ubuntu18 b/docker/Dockerfile.nrUE.ubuntu20 similarity index 86% rename from docker/Dockerfile.nrUE.ubuntu18 rename to docker/Dockerfile.nrUE.ubuntu20 index 5fdf41ef2d..f462fa9632 100644 --- a/docker/Dockerfile.nrUE.ubuntu18 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -21,7 +21,7 @@ #--------------------------------------------------------------------- # # Dockerfile for the Open-Air-Interface BUILD service -# Valid for Ubuntu 18.04 +# Valid for Ubuntu 20.04 # #--------------------------------------------------------------------- @@ -33,7 +33,7 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_paramete cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM ubuntu:bionic as oai-nr-ue +FROM ubuntu:focal as oai-nr-ue ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris @@ -89,17 +89,18 @@ COPY --from=nr-ue-build \ # Now we are copying from builder-image the UHD files. COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin -COPY --from=nr-ue-base /usr/local/lib/libuhd.so.3.15.0 /usr/local/lib +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_date_time.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ - /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \ + /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" && \ diff --git a/docker/README.md b/docker/README.md index c591ee3d75..069799e368 100644 --- a/docker/README.md +++ b/docker/README.md @@ -68,6 +68,7 @@ Targets can be: - `build` for an image named `ran-build` (shared image) - `eNB` for an image named `oai-enb` - `gNB` for an image named `oai-gnb` +- `nr-cuup` for an image named `oai-nr-cuup` - `gNB.aw2s` for an image named `oai-gnb-aw2s` - `lteUE` for an image named `oai-lte-ue` - `nrUE` for an image named `oai-nr-ue` @@ -75,17 +76,17 @@ Targets can be: The currently-supported OS are: - `rhel8.2` for Red Hat Entreprise Linux (including images for an OpenShift cluster) -- `ubuntu18` for Ubuntu 18.04 LTS +- `ubuntu20` for Ubuntu 20.04 LTS For more details regarding the build on an Openshift Cluster, see [OpenShift README](../openshift/README.md). -# 3. Building using `docker` under Ubuntu 18.04 # +# 3. Building using `docker` under Ubuntu 20.04 # ## 3.1. Pre-requisites ## * `git` installed * `docker-ce` installed -* Pulling `ubuntu:bionic` from DockerHub +* Pulling `ubuntu:focal` from DockerHub ## 3.2. Building the shared images ## @@ -95,8 +96,8 @@ There are two shared images: one that has all dependencies, and a second that co git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git cd openairinterface5g git checkout develop -docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu18 . -docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu18 . +docker build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.ubuntu20 . +docker build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.ubuntu20 . ``` After building both: @@ -115,7 +116,7 @@ ran-base latest 5c9c02a5b4a8 1 minute ago For example, the eNB: ```bash -docker build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.ubuntu18 . +docker build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.ubuntu20 . ``` After a while: