Commit c9ee41b6 authored by sagar arora's avatar sagar arora

Updated target dockerfile

Signed-off-by: default avatarsagar arora <sagar.arora@openairinterface.org>
parent ac1e59ca
...@@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build ...@@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build
#start from scratch for target executable #start from scratch for target executable
FROM ubuntu:focal as oai-gnb FROM ubuntu:jammy as oai-gnb
ARG BUILD_OPTION ARG BUILD_OPTION
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe ENV TZ=Europe
...@@ -41,6 +41,7 @@ RUN apt-get update && \ ...@@ -41,6 +41,7 @@ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --yes \ DEBIAN_FRONTEND=noninteractive apt-get install --yes \
software-properties-common \ software-properties-common \
procps \ procps \
pkg-config \
libsctp1 \ libsctp1 \
tzdata \ tzdata \
libblas3 \ libblas3 \
...@@ -52,11 +53,13 @@ RUN apt-get update && \ ...@@ -52,11 +53,13 @@ RUN apt-get update && \
iproute2 \ iproute2 \
iputils-ping \ iputils-ping \
gdb \ gdb \
python \ pciutils \
libpcap-dev \
xz-utils \
libnuma-dev \
python3 \ python3 \
python3-six \ python3-six \
python3-requests \ python3-requests &&\
libusb-1.0-0 && \
# if the --sanitize option was used to build, additional packages are required # if the --sanitize option was used to build, additional packages are required
/bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \ /bin/bash -c 'if [[ "$BUILD_OPTION" = "--sanitize" ]]; then DEBIAN_FRONTEND=noninteractive apt-get install --yes \
libasan5 \ libasan5 \
...@@ -70,9 +73,8 @@ COPY --from=gnb-build \ ...@@ -70,9 +73,8 @@ COPY --from=gnb-build \
COPY ./docker/scripts/gnb_entrypoint.sh ./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/librfsimulator.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \ /oai-ran/cmake_targets/ran_build/build/liboai_transpro.so \
/oai-ran/cmake_targets/ran_build/build/libcoding.so \ /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/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libdfts.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \
...@@ -81,38 +83,24 @@ COPY --from=gnb-build \ ...@@ -81,38 +83,24 @@ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \ /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_ci.so \
/usr/local/lib/ /usr/local/lib/
## DPDK libraries
COPY --from=gnb-build \
/usr/local/lib/x86_64-linux-gnu/librte_timer.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_ethdev.so.2 \
/usr/local/lib/x86_64-linux-gnu/librte_net.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_eal.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_kvargs.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_telemetry.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_mbuf.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_mempool.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_ring.so.21 \
/usr/local/lib/x86_64-linux-gnu/librte_meter.so.21 \
/usr/local/lib/x86_64-linux-gnu/
## Libxran library ## Libxran library
COPY --from=gnb-build \ COPY --from=gnb-build \
/opt/phy/fhi_lib/lib/build/libxran.so \ /opt/phy/fhi_lib/lib/build/libxran.so \
/opt/phy/fhi_lib/lib/build/ /opt/phy/fhi_lib/lib/build/
# Now we are copying from builder-image the UHD files. ## DPDK libraries
COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin COPY --from=gnb-build /usr/local/lib/x86_64-linux-gnu /usr/local/lib/x86_64-linux-gnu/
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 # Copying liboost files
COPY --from=gnb-base \ COPY --from=gnb-base \
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_regex.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_system.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \ /usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.74.0 \
/usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
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" && \
......
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