Skip to content

O
OpenXG-RAN
Commit 26eda2f2 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files
Options

fix(build): migrating rocky dockerfiles to Rocky-linux-9 to ease maintenance 

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 2b717d49
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 129 deletions
docker/Dockerfile.base.rocky
View file @ 26eda2f2
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM $BASE_IMAGE AS ran-base FROM $BASE_IMAGE AS ran-base
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
...@@ -33,7 +33,6 @@ ENV BUILD_UHD_FROM_SOURCE=True ...@@ -33,7 +33,6 @@ ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=4.4.0.0 ENV UHD_VERSION=4.4.0.0
RUN dnf install 'dnf-command(config-manager)' -y && \ RUN dnf install 'dnf-command(config-manager)' -y && \
dnf config-manager --set-enabled powertools && \
dnf install epel-release -y && crb enable && \ dnf install epel-release -y && crb enable && \
dnf update -y && \ dnf update -y && \
dnf install -y \ dnf install -y \
......
docker/Dockerfile.build.rocky
View file @ 26eda2f2
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
......
docker/Dockerfile.eNB.rocky
View file @ 26eda2f2
...@@ -21,17 +21,15 @@ ...@@ -21,17 +21,15 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM ran-base:latest AS enb-base FROM ran-base:latest AS enb-base
FROM ran-build:latest AS enb-build FROM ran-build:latest AS enb-build
RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \
cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable #start from scratch for target executable
FROM $BASE_IMAGE as oai-enb FROM $BASE_IMAGE as oai-enb
...@@ -56,9 +54,9 @@ RUN dnf update -y && \ ...@@ -56,9 +54,9 @@ RUN dnf update -y && \
WORKDIR /opt/oai-enb/bin WORKDIR /opt/oai-enb/bin
COPY --from=enb-build \ COPY --from=enb-build \
/oai-ran/cmake_targets/ran_build/build/lte-softmodem \ /oai-ran/cmake_targets/ran_build/build/lte-softmodem ./
/oai-ran/docker/scripts/entrypoint.sh \
./ COPY ./docker/scripts/enb_entrypoint.sh ./entrypoint.sh
COPY --from=enb-build \ COPY --from=enb-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
...@@ -73,24 +71,25 @@ COPY --from=enb-build \ ...@@ -73,24 +71,25 @@ COPY --from=enb-build \
/usr/local/lib/ /usr/local/lib/
COPY --from=enb-base \ COPY --from=enb-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.11 \
/lib64/libblas.so.3 \ /lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \ /lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \ /lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.66.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.66.0 \ /lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.66.0 \ /lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.66.0 \ /lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.66.0 \ /lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.66.0 \ /lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \ /lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.66.0 \ /lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.66.0 \ /lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.66.0 \ /lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.60 \ /lib64/libicudata.so.67 \
/lib64/libicui18n.so.60 \ /lib64/libicui18n.so.67 \
/lib64/libicuuc.so.60 \ /lib64/libicuuc.so.67 \
/lib64/ /lib64/
...@@ -116,10 +115,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai ...@@ -116,10 +115,6 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \ echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \
echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.so echo "ldd on libtelnetsrv_enb.so" && ldd /usr/local/lib/libtelnetsrv_enb.so
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-enb/etc
COPY --from=enb-build /oai-ran/docker/etc .
WORKDIR /opt/oai-enb WORKDIR /opt/oai-enb
# 2152 --> S1U, GTP/UDP # 2152 --> S1U, GTP/UDP
......
docker/Dockerfile.gNB.aw2s.rocky
View file @ 26eda2f2
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM ran-base:latest AS gnb-base FROM ran-base:latest AS gnb-base
FROM ran-build:latest AS gnb-build FROM ran-build:latest AS gnb-build
...@@ -55,11 +55,11 @@ RUN dnf update -y && \ ...@@ -55,11 +55,11 @@ RUN dnf update -y && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \ echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
COPY ./libori.so /usr/local/lib
WORKDIR /opt/oai-gnb-aw2s/bin WORKDIR /opt/oai-gnb-aw2s/bin
COPY --from=gnb-build \ COPY --from=gnb-build /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./
/oai-ran/cmake_targets/ran_build/build/nr-softmodem \ COPY ./docker/scripts/gnb-aw2s_entrypoint.sh /opt/oai-gnb-aw2s/bin/entrypoint.sh
./
COPY ./docker/scripts/gnb-aw2s_entrypoint.sh ./entrypoint.sh
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
...@@ -70,21 +70,30 @@ COPY --from=gnb-build \ ...@@ -70,21 +70,30 @@ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/libdfts.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*.so \
/oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
/usr/local/lib/libori.so \
/usr/local/lib/ /usr/local/lib/
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.11 \
/lib64/libforms.so.2 \ /lib64/libforms.so.2 \
/lib64/libblas.so.3 \ /lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \ /lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
/lib64/ /lib64/
RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \ 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 && \ 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 liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
echo "ldd on libthirdparty_transpro.so" && ldd /usr/local/lib/libthirdparty_transpro.so && \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so
WORKDIR /opt/oai-gnb-aw2s WORKDIR /opt/oai-gnb-aw2s
ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"] ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"] CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]
docker/Dockerfile.gNB.rocky
View file @ 26eda2f2
...@@ -21,17 +21,15 @@ ...@@ -21,17 +21,15 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM ran-base:latest AS gnb-base FROM ran-base:latest AS gnb-base
FROM ran-build:latest AS gnb-build FROM ran-build:latest AS gnb-build
RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \
cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable #start from scratch for target executable
FROM $BASE_IMAGE as oai-gnb FROM $BASE_IMAGE as oai-gnb
...@@ -57,9 +55,8 @@ RUN dnf update -y && \ ...@@ -57,9 +55,8 @@ RUN dnf update -y && \
WORKDIR /opt/oai-gnb/bin WORKDIR /opt/oai-gnb/bin
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/nr-softmodem \ /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./
/oai-ran/docker/scripts/entrypoint.sh \ COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh
./
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
...@@ -74,25 +71,26 @@ COPY --from=gnb-build \ ...@@ -74,25 +71,26 @@ COPY --from=gnb-build \
/usr/local/lib/ /usr/local/lib/
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.11 \
/lib64/libforms.so.2 \ /lib64/libforms.so.2 \
/lib64/libblas.so.3 \ /lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \ /lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \ /lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.66.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.66.0 \ /lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.66.0 \ /lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.66.0 \ /lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.66.0 \ /lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.66.0 \ /lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \ /lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.66.0 \ /lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.66.0 \ /lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.66.0 \ /lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.60 \ /lib64/libicudata.so.67 \
/lib64/libicui18n.so.60 \ /lib64/libicui18n.so.67 \
/lib64/libicuuc.so.60 \ /lib64/libicuuc.so.67 \
/lib64/ /lib64/
# Now we are copying from builder-image the UHD files. # Now we are copying from builder-image the UHD files.
...@@ -104,11 +102,16 @@ WORKDIR /usr/local/share/uhd/rfnoc ...@@ -104,11 +102,16 @@ WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=gnb-base /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" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig ldconfig && \
echo "ldd on nr-softmodem" && ldd /opt/oai-gnb/bin/nr-softmodem && \
# Copy the relevant configuration files for gNB echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
WORKDIR /opt/oai-gnb/etc echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
COPY --from=gnb-build /oai-ran/docker/etc . echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \
echo "ldd on libtelnetsrv_ci.so" && ldd /usr/local/lib/libtelnetsrv_ci.so
WORKDIR /opt/oai-gnb WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
......
docker/Dockerfile.lteUE.rocky
View file @ 26eda2f2
...@@ -21,18 +21,15 @@ ...@@ -21,18 +21,15 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM ran-base:latest AS lte-ue-base FROM ran-base:latest AS lte-ue-base
FROM ran-build:latest AS lte-ue-build FROM ran-build:latest AS lte-ue-build
RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \
cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable #start from scratch for target executable
FROM $BASE_IMAGE as oai-lte-ue FROM $BASE_IMAGE as oai-lte-ue
...@@ -58,12 +55,12 @@ RUN dnf update -y && \ ...@@ -58,12 +55,12 @@ RUN dnf update -y && \
WORKDIR /opt/oai-lte-ue/bin WORKDIR /opt/oai-lte-ue/bin
COPY --from=lte-ue-build \ COPY --from=lte-ue-build \
/oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \ /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \
/oai-ran/docker/scripts/entrypoint.sh \
/oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \ /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \
/oai-ran/cmake_targets/nas_sim_tools/build/nvram \ /oai-ran/cmake_targets/nas_sim_tools/build/nvram \
/oai-ran/cmake_targets/nas_sim_tools/build/usim \ /oai-ran/cmake_targets/nas_sim_tools/build/usim \
./ ./
COPY ./docker/scripts/lte_ue_entrypoint.sh ./entrypoint.sh
COPY --from=lte-ue-build \ COPY --from=lte-ue-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
...@@ -75,24 +72,25 @@ COPY --from=lte-ue-build \ ...@@ -75,24 +72,25 @@ COPY --from=lte-ue-build \
/usr/local/lib/ /usr/local/lib/
COPY --from=lte-ue-base \ COPY --from=lte-ue-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.11 \
/lib64/libblas.so.3 \ /lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \ /lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \ /lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.66.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.66.0 \ /lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.66.0 \ /lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.66.0 \ /lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.66.0 \ /lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.66.0 \ /lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \ /lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.66.0 \ /lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.66.0 \ /lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.66.0 \ /lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.60 \ /lib64/libicudata.so.67 \
/lib64/libicui18n.so.60 \ /lib64/libicui18n.so.67 \
/lib64/libicuuc.so.60 \ /lib64/libicuuc.so.67 \
/lib64/ /lib64/
# Now we are copying from builder-image the UHD files. # Now we are copying from builder-image the UHD files.
...@@ -106,17 +104,16 @@ COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ . ...@@ -106,17 +104,16 @@ COPY --from=lte-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" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \ ldconfig && \
echo "ldd on lte-uesoftmodem" && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \ echo "ldd on lte-uesoftmodem" && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \
echo "ldd on liboai_eth_transpro" && ldd /usr/local/lib/liboai_eth_transpro.so && \ echo "ldd on conf2uedata" && ldd /opt/oai-lte-ue/bin/conf2uedata && \
echo "ldd on librfsimulator" && ldd /usr/local/lib/librfsimulator.so && \ echo "ldd on nvram" && ldd /opt/oai-lte-ue/bin/nvram && \
echo "ldd on liboai_usrpdevif" && ldd /usr/local/lib/liboai_usrpdevif.so && \ echo "ldd on usim" && ldd /opt/oai-lte-ue/bin/usim && \
echo "ldd on libcoding" && ldd /usr/local/lib/libcoding.so && \ echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
echo "ldd on libparams_libconfig" && ldd /usr/local/lib/libparams_libconfig.so && \ echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
echo "ldd on libdfts" && ldd /usr/local/lib/libdfts.so && \ echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \
echo "ldd on libtelnetsrv" && ldd /usr/local/lib/libtelnetsrv.so echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
# Copy the relevant configuration files for UE echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
WORKDIR /opt/oai-lte-ue/etc echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so
COPY --from=lte-ue-build /oai-ran/docker/etc .
WORKDIR /opt/oai-lte-ue WORKDIR /opt/oai-lte-ue
CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"] CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
......
docker/Dockerfile.nr-cuup.rocky
View file @ 26eda2f2
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM ran-base:latest AS gnb-base FROM ran-base:latest AS gnb-base
FROM ran-build:latest AS gnb-build FROM ran-build:latest AS gnb-build
...@@ -36,8 +36,9 @@ RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypo ...@@ -36,8 +36,9 @@ RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypo
FROM $BASE_IMAGE as oai-nr-cuup FROM $BASE_IMAGE as oai-nr-cuup
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN dnf update -y && \ RUN yum repolist --disablerepo=* && \
dnf install -y \ yum update -y && \
yum install -y \
procps-ng \ procps-ng \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
...@@ -59,8 +60,9 @@ COPY --from=gnb-build \ ...@@ -59,8 +60,9 @@ COPY --from=gnb-build \
/usr/local/lib/ /usr/local/lib/
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.11 \
/lib64/libblas.so.3 \ /lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \ /lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
/lib64/ /lib64/
......
docker/Dockerfile.nrUE.rocky
View file @ 26eda2f2
...@@ -21,17 +21,15 @@ ...@@ -21,17 +21,15 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface BUILD service # Dockerfile for the Open-Air-Interface BUILD service
# Valid for Rocky 8.7 # Valid for Rocky 9
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
ARG BASE_IMAGE=docker.io/rockylinux:8.7 ARG BASE_IMAGE=docker.io/rockylinux:9
FROM ran-base:latest AS nr-ue-base FROM ran-base:latest AS nr-ue-base
FROM ran-build:latest AS nr-ue-build FROM ran-build:latest AS nr-ue-build
RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \
cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable #start from scratch for target executable
FROM $BASE_IMAGE as oai-nr-ue FROM $BASE_IMAGE as oai-nr-ue
...@@ -59,9 +57,8 @@ RUN dnf update -y && \ ...@@ -59,9 +57,8 @@ RUN dnf update -y && \
WORKDIR /opt/oai-nr-ue/bin WORKDIR /opt/oai-nr-ue/bin
COPY --from=nr-ue-build \ COPY --from=nr-ue-build \
/oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \ /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./ ./
COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh
WORKDIR /opt/oai-nr-ue/etc WORKDIR /opt/oai-nr-ue/etc
COPY --from=nr-ue-build \ COPY --from=nr-ue-build \
...@@ -77,25 +74,26 @@ COPY --from=nr-ue-build \ ...@@ -77,25 +74,26 @@ COPY --from=nr-ue-build \
/usr/local/lib/ /usr/local/lib/
COPY --from=nr-ue-base \ COPY --from=nr-ue-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.11 \
/lib64/libblas.so.3 \ /lib64/libblas.so.3 \
/lib64/libcblas.so.3 \
/lib64/liblapack.so.3 \ /lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
/lib64/libforms.so.2 \ /lib64/libforms.so.2 \
/lib64/libboost_chrono.so.1.66.0 \ /lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.66.0 \ /lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.66.0 \ /lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.66.0 \ /lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.66.0 \ /lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.66.0 \ /lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.66.0 \ /lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \ /lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.66.0 \ /lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.66.0 \ /lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.66.0 \ /lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.60 \ /lib64/libicudata.so.67 \
/lib64/libicui18n.so.60 \ /lib64/libicui18n.so.67 \
/lib64/libicuuc.so.60 \ /lib64/libicuuc.so.67 \
/lib64/ /lib64/
# Now we are copying from builder-image the UHD files. # Now we are copying from builder-image the UHD files.
...@@ -107,11 +105,16 @@ WORKDIR /usr/local/share/uhd/rfnoc ...@@ -107,11 +105,16 @@ WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=nr-ue-base /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" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig ldconfig && \
echo "ldd on nr-uesoftmodem" && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \
# Copy the relevant configuration files for eNB echo "ldd on liboai_eth_transpro.so" && ldd /usr/local/lib/liboai_eth_transpro.so && \
WORKDIR /opt/oai-nr-ue/etc echo "ldd on librfsimulator.so" && ldd /usr/local/lib/librfsimulator.so && \
COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/ue.* . echo "ldd on liboai_usrpdevif.so" && ldd /usr/local/lib/liboai_usrpdevif.so && \
echo "ldd on libcoding.so" && ldd /usr/local/lib/libcoding.so && \
echo "ldd on libparams_libconfig.so" && ldd /usr/local/lib/libparams_libconfig.so && \
echo "ldd on libdfts.so" && ldd /usr/local/lib/libdfts.so && \
echo "ldd on libtelnetsrv.so" && ldd /usr/local/lib/libtelnetsrv.so && \
echo "ldd on libtelnetsrv_5Gue.so" && ldd /usr/local/lib/libtelnetsrv_5Gue.so
WORKDIR /opt/oai-nr-ue WORKDIR /opt/oai-nr-ue
CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"] CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment