Skip to content

O
OpenXG-RAN
Commit bf11d345 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Clean up of Ubuntu 18 Docker files

parent 11727f9d
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 64 deletions
docker/Dockerfile.eNB.ubuntu18
View file @ bf11d345
...@@ -67,17 +67,16 @@ COPY --from=enb-build \ ...@@ -67,17 +67,16 @@ COPY --from=enb-build \
/oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/docker/scripts/entrypoint.sh \
./ ./
WORKDIR /usr/local/lib/
COPY --from=enb-build \ COPY --from=enb-build \
/oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
/oai-ran/targets/bin/librfsimulator.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/targets/bin/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \
/oai-ran/targets/bin/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 \
/oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \ /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
./ /usr/local/lib/
# 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
...@@ -86,7 +85,6 @@ COPY --from=enb-base \ ...@@ -86,7 +85,6 @@ COPY --from=enb-base \
/usr/local/lib/libprotobuf-c.so.1 \ /usr/local/lib/libprotobuf-c.so.1 \
/usr/local/lib/ /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
WORKDIR /usr/lib/x86_64-linux-gnu
COPY --from=enb-base \ COPY --from=enb-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ /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_filesystem.so.1.65.1 \
...@@ -95,11 +93,9 @@ COPY --from=enb-base \ ...@@ -95,11 +93,9 @@ COPY --from=enb-base \
/usr/lib/x86_64-linux-gnu/libboost_thread.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_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_program_options.so.1.65.1 \
./ /usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \ 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_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
/bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
ldconfig ldconfig
# Copy the relevant configuration files for eNB # Copy the relevant configuration files for eNB
......
docker/Dockerfile.gNB.ubuntu18
View file @ bf11d345
...@@ -66,20 +66,19 @@ COPY --from=gnb-build \ ...@@ -66,20 +66,19 @@ COPY --from=gnb-build \
/oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/docker/scripts/entrypoint.sh \
./ ./
WORKDIR /usr/local/lib/
COPY --from=gnb-build \ COPY --from=gnb-build \
/oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
/oai-ran/targets/bin/librfsimulator.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/targets/bin/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \
/oai-ran/targets/bin/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 \
/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/libldpc_optim.so \ /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
/oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
/oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
./ /usr/local/lib/
# 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
...@@ -88,7 +87,6 @@ COPY --from=gnb-base \ ...@@ -88,7 +87,6 @@ COPY --from=gnb-base \
/usr/local/lib/libprotobuf-c.so.1 \ /usr/local/lib/libprotobuf-c.so.1 \
/usr/local/lib/ /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
WORKDIR /usr/lib/x86_64-linux-gnu
COPY --from=gnb-base \ COPY --from=gnb-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ /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_filesystem.so.1.65.1 \
...@@ -97,11 +95,9 @@ COPY --from=gnb-base \ ...@@ -97,11 +95,9 @@ COPY --from=gnb-base \
/usr/lib/x86_64-linux-gnu/libboost_thread.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_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_program_options.so.1.65.1 \
./ /usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \ 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_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
/bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
ldconfig ldconfig
# Copy the relevant configuration files for gNB # Copy the relevant configuration files for gNB
......
docker/Dockerfile.lteRU.ubuntu18
View file @ bf11d345
...@@ -62,22 +62,20 @@ COPY --from=ru-build \ ...@@ -62,22 +62,20 @@ COPY --from=ru-build \
/oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/docker/scripts/entrypoint.sh \
./ ./
WORKDIR /usr/local/lib/
COPY --from=ru-build \ COPY --from=ru-build \
/oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
/oai-ran/targets/bin/librfsimulator.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/targets/bin/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 \
./ /usr/local/lib/
# 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.3.15.0 /usr/local/lib COPY --from=ru-base /usr/local/lib/libuhd.so.3.15.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
WORKDIR /usr/lib/x86_64-linux-gnu
COPY --from=ru-base \ COPY --from=ru-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \ /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_filesystem.so.1.65.1 \
...@@ -85,11 +83,9 @@ COPY --from=ru-base \ ...@@ -85,11 +83,9 @@ COPY --from=ru-base \
/usr/lib/x86_64-linux-gnu/libboost_serialization.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_thread.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \ /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
./ /usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \ 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_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
/bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
ldconfig ldconfig
# Copy the relevant configuration files for RRU # Copy the relevant configuration files for RRU
......
docker/Dockerfile.lteUE.ubuntu18
View file @ bf11d345
...@@ -71,17 +71,16 @@ COPY --from=lte-ue-build \ ...@@ -71,17 +71,16 @@ COPY --from=lte-ue-build \
/oai-ran/targets/bin/usim \ /oai-ran/targets/bin/usim \
./ ./
WORKDIR /usr/local/lib/
COPY --from=lte-ue-build \ COPY --from=lte-ue-build \
/oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
/oai-ran/targets/bin/librfsimulator.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/targets/bin/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \
/oai-ran/targets/bin/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libSIMU.so \ /oai-ran/cmake_targets/ran_build/build/libSIMU.so \
/oai-ran/cmake_targets/ran_build/build/libdfts.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \
./ /usr/local/lib/
# 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
...@@ -91,7 +90,6 @@ COPY --from=lte-ue-base \ ...@@ -91,7 +90,6 @@ COPY --from=lte-ue-base \
/usr/local/lib/ /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
WORKDIR /usr/lib/x86_64-linux-gnu
COPY --from=lte-ue-base \ 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_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_filesystem.so.1.65.1 \
...@@ -100,11 +98,9 @@ COPY --from=lte-ue-base \ ...@@ -100,11 +98,9 @@ COPY --from=lte-ue-base \
/usr/lib/x86_64-linux-gnu/libboost_thread.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_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_program_options.so.1.65.1 \
./ /usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \ 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_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
/bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
ldconfig ldconfig
# Copy the relevant configuration files for UE # Copy the relevant configuration files for UE
......
docker/Dockerfile.nrUE.ubuntu18
View file @ bf11d345
...@@ -69,20 +69,19 @@ COPY --from=nr-ue-build \ ...@@ -69,20 +69,19 @@ COPY --from=nr-ue-build \
WORKDIR /opt/oai-nr-ue/etc WORKDIR /opt/oai-nr-ue/etc
COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf . COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf .
WORKDIR /usr/local/lib/
COPY --from=nr-ue-build \ COPY --from=nr-ue-build \
/oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/targets/bin/libtcp_bridge_oai.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/libtcp_bridge_oai.so \
/oai-ran/targets/bin/librfsimulator.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/targets/bin/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \
/oai-ran/targets/bin/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 \
/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/libldpc_optim.so \ /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
/oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \ /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
/oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \ /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
./ /usr/local/lib/
# 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
...@@ -92,7 +91,6 @@ COPY --from=nr-ue-base \ ...@@ -92,7 +91,6 @@ COPY --from=nr-ue-base \
/usr/local/lib/ /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
WORKDIR /usr/lib/x86_64-linux-gnu
COPY --from=nr-ue-base \ 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_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_filesystem.so.1.65.1 \
...@@ -101,11 +99,9 @@ COPY --from=nr-ue-base \ ...@@ -101,11 +99,9 @@ COPY --from=nr-ue-base \
/usr/lib/x86_64-linux-gnu/libboost_thread.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_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_program_options.so.1.65.1 \
./ /usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so.Rel15 /usr/local/lib/liboai_transpro.so" && \ 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_usrpdevif.so.Rel15 /usr/local/lib/liboai_device.so" && \
/bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so" && \
ldconfig ldconfig
WORKDIR /opt/oai-nr-ue WORKDIR /opt/oai-nr-ue
......
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