maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ci-update-uhd' into 'develop'

Browse Source 
CI: Update UHD version to 4.8

See merge request oai/openairinterface5g!3587
This commit is contained in:
Robert Schmidt
2025-08-13 10:20:38 +00:00
parent 05f9c975ee 8f79abed2e
commit 843b12db7f
18 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/build_helper
+1 -1
View File
@@ -263,7 +263,7 @@ install_usrp_uhd_driver_from_source(){
# - 3.15.0.0 # - 3.15.0.0
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff git apply $OPENAIR_DIR/cmake_targets/tools/uhd-3.15-tdd-patch.diff
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch" ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
elif [[ "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then elif [[ "$UHD_VERSION" == "4.8.0.0" || "$UHD_VERSION" == "4.7.0.0" || "$UHD_VERSION" == "4.6.0.0" || "$UHD_VERSION" == "4.5.0.0" ]]; then
# Tested that patch for the following versions: # Tested that patch for the following versions:
# - 4.7.0.0 # - 4.7.0.0
cp $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff cp $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff $OPENAIR_DIR/cmake_targets/tools/uhd-4.5plus-tdd-patch.diff
docker/Dockerfile.base.rhel9
+1 -1
View File
@@ -32,7 +32,7 @@ ARG NEEDED_GIT_PROXY
ARG TARGETARCH ARG TARGETARCH
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 ENV UHD_VERSION=4.8.0.0
# Copy the entitlements # Copy the entitlements
COPY ./etc-pki-entitlement /etc/pki/entitlement COPY ./etc-pki-entitlement /etc/pki/entitlement
docker/Dockerfile.base.rocky
+1 -1
View File
@@ -30,7 +30,7 @@ FROM $BASE_IMAGE AS ran-base
ARG TARGETARCH ARG TARGETARCH
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 ENV UHD_VERSION=4.8.0.0
RUN dnf install 'dnf-command(config-manager)' -y && \ RUN dnf install 'dnf-command(config-manager)' -y && \
dnf install epel-release -y && crb enable && \ dnf install epel-release -y && crb enable && \
docker/Dockerfile.base.ubuntu22
+1 -1
View File
@@ -32,7 +32,7 @@ ARG TARGETARCH
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 ENV UHD_VERSION=4.8.0.0
#install developers pkg/repo #install developers pkg/repo
RUN apt-get update && \ RUN apt-get update && \
docker/Dockerfile.eNB.rhel9
+2 -2
View File
@@ -90,7 +90,7 @@ COPY --from=enb-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=enb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
@@ -111,7 +111,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/liboai_iqplayer.so \ /usr/local/lib/liboai_iqplayer.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_enb.so \ /usr/local/lib/libtelnetsrv_enb.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-enb WORKDIR /opt/oai-enb
docker/Dockerfile.eNB.rocky
+2 -2
View File
@@ -91,7 +91,7 @@ COPY --from=enb-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=enb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=enb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
@@ -112,7 +112,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/liboai_iqplayer.so \ /usr/local/lib/liboai_iqplayer.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_enb.so \ /usr/local/lib/libtelnetsrv_enb.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-enb WORKDIR /opt/oai-enb
docker/Dockerfile.eNB.ubuntu22
+2 -2
View File
@@ -104,7 +104,7 @@ COPY --from=enb-build \
# Now we are copying from builder-image the UHD files. # 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/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/libuhd.so.4.8.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/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
@@ -121,7 +121,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/liboai_iqplayer.so \ /usr/local/lib/liboai_iqplayer.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_enb.so \ /usr/local/lib/libtelnetsrv_enb.so \
/usr/local/lib/libuhd.so.4.4.0 /usr/local/lib/libuhd.so.4.8.0
WORKDIR /opt/oai-enb WORKDIR /opt/oai-enb
docker/Dockerfile.gNB.rhel9
+2 -2
View File
@@ -97,7 +97,7 @@ COPY --from=gnb-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
## Copy E2 SM models ## Copy E2 SM models
@@ -120,7 +120,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libldpc*.so \ /usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_ci.so \ /usr/local/lib/libtelnetsrv_ci.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-gnb WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
docker/Dockerfile.gNB.rocky
+2 -2
View File
@@ -94,7 +94,7 @@ COPY --from=gnb-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=gnb-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
@@ -114,7 +114,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libldpc*.so \ /usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_ci.so \ /usr/local/lib/libtelnetsrv_ci.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-gnb WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
docker/Dockerfile.gNB.ubuntu22
+2 -2
View File
@@ -116,7 +116,7 @@ COPY --from=gnb-build \
# Now we are copying from builder-image the UHD files. # 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/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/libuhd.so.4.8.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/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
## Copy E2 SM models ## Copy E2 SM models
COPY --from=gnb-build /usr/local/lib/flexric /usr/local/lib/flexric COPY --from=gnb-build /usr/local/lib/flexric /usr/local/lib/flexric
@@ -135,7 +135,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libldpc*.so \ /usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_ci.so \ /usr/local/lib/libtelnetsrv_ci.so \
/usr/local/lib/libuhd.so.4.4.0 /usr/local/lib/libuhd.so.4.8.0
WORKDIR /opt/oai-gnb WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
docker/Dockerfile.lteRU.rhel9
+2 -2
View File
@@ -80,7 +80,7 @@ COPY --from=ru-base \
# Copying from the ran-build image the USRP needed packages # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=ru-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=ru-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
@@ -96,7 +96,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/liboai_usrpdevif.so \ /usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-lte-ru WORKDIR /opt/oai-lte-ru
docker/Dockerfile.lteRU.ubuntu22
+2 -2
View File
@@ -68,7 +68,7 @@ COPY --from=ru-build \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=ru-base /usr/local/lib/libuhd.so.4.4.0 /usr/local/lib COPY --from=ru-base /usr/local/lib/libuhd.so.4.8.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/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
COPY --from=ru-base \ COPY --from=ru-base \
@@ -91,7 +91,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/liboai_usrpdevif.so \ /usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
/usr/local/lib/libuhd.so.4.4.0 /usr/local/lib/libuhd.so.4.8.0
WORKDIR /opt/oai-lte-ru WORKDIR /opt/oai-lte-ru
docker/Dockerfile.lteUE.rhel9
+2 -2
View File
@@ -95,7 +95,7 @@ COPY --from=lte-ue-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin 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 WORKDIR /usr/local/share/uhd/rfnoc
@@ -113,7 +113,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-lte-ue WORKDIR /opt/oai-lte-ue
COPY --from=lte-ue-base /tini /tini COPY --from=lte-ue-base /tini /tini
docker/Dockerfile.lteUE.rocky
+2 -2
View File
@@ -96,7 +96,7 @@ COPY --from=lte-ue-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin 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 WORKDIR /usr/local/share/uhd/rfnoc
@@ -114,7 +114,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-lte-ue WORKDIR /opt/oai-lte-ue
COPY --from=lte-ue-base /tini /tini COPY --from=lte-ue-base /tini /tini
docker/Dockerfile.lteUE.ubuntu22
+2 -2
View File
@@ -107,7 +107,7 @@ COPY --from=lte-ue-build \
# Now we are copying from builder-image the UHD files. # 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/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/libuhd.so.4.8.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/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
@@ -122,7 +122,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libuhd.so.4.4.0 /usr/local/lib/libuhd.so.4.8.0
WORKDIR /opt/oai-lte-ue WORKDIR /opt/oai-lte-ue
COPY --from=lte-ue-base /tini /tini COPY --from=lte-ue-base /tini /tini
docker/Dockerfile.nrUE.rhel9
+2 -2
View File
@@ -99,7 +99,7 @@ COPY --from=nr-ue-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin 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 WORKDIR /usr/local/share/uhd/rfnoc
@@ -119,7 +119,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libldpc*.so \ /usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_5Gue.so \ /usr/local/lib/libtelnetsrv_5Gue.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-nr-ue WORKDIR /opt/oai-nr-ue
COPY --from=nr-ue-base /tini /tini COPY --from=nr-ue-base /tini /tini
docker/Dockerfile.nrUE.rocky
+2 -2
View File
@@ -96,7 +96,7 @@ COPY --from=nr-ue-base \
# Now we are copying from builder-image the UHD files. # 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/bin/uhd_find_devices /usr/local/bin
COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64 COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.4.8.0 /usr/local/lib64
COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin 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 WORKDIR /usr/local/share/uhd/rfnoc
@@ -116,7 +116,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libldpc*.so \ /usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_5Gue.so \ /usr/local/lib/libtelnetsrv_5Gue.so \
/usr/local/lib64/libuhd.so.4.4.0 /usr/local/lib64/libuhd.so.4.8.0
WORKDIR /opt/oai-nr-ue WORKDIR /opt/oai-nr-ue
COPY --from=nr-ue-base /tini /tini COPY --from=nr-ue-base /tini /tini
docker/Dockerfile.nrUE.ubuntu22
+2 -2
View File
@@ -115,7 +115,7 @@ COPY --from=nr-ue-build \
# Now we are copying from builder-image the UHD files. # 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/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/libuhd.so.4.8.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/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
@@ -133,7 +133,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
/usr/local/lib/libtelnetsrv.so \ /usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_ciUE.so \ /usr/local/lib/libtelnetsrv_ciUE.so \
/usr/local/lib/libtelnetsrv_5Gue.so \ /usr/local/lib/libtelnetsrv_5Gue.so \
/usr/local/lib/libuhd.so.4.4.0 /usr/local/lib/libuhd.so.4.8.0
WORKDIR /opt/oai-nr-ue WORKDIR /opt/oai-nr-ue
COPY --from=nr-ue-base /tini /tini COPY --from=nr-ue-base /tini /tini