Skip to content

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

Clean up RHEL 8.2 docker files

parent bf11d345
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 56 deletions
docker/Dockerfile.eNB.rhel8.2
View file @ 28da113c
...@@ -60,17 +60,16 @@ COPY --from=enb-build \ ...@@ -60,17 +60,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/
COPY --from=enb-base \ COPY --from=enb-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.9 \
...@@ -99,9 +98,7 @@ COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oa ...@@ -99,9 +98,7 @@ COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oa
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=enb-base /usr/local/share/uhd/rfnoc/ . COPY --from=enb-base /usr/local/share/uhd/rfnoc/ .
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.rhel8.2
View file @ 28da113c
...@@ -62,20 +62,19 @@ COPY --from=gnb-build \ ...@@ -62,20 +62,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/
COPY --from=gnb-base \ COPY --from=gnb-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.9 \
...@@ -105,9 +104,7 @@ COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oa ...@@ -105,9 +104,7 @@ COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oa
WORKDIR /usr/local/share/uhd/rfnoc 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_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.rhel8.2
View file @ 28da113c
...@@ -57,15 +57,14 @@ COPY --from=ru-build \ ...@@ -57,15 +57,14 @@ 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/
COPY --from=ru-base \ COPY --from=ru-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.9 \
...@@ -93,9 +92,7 @@ COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai ...@@ -93,9 +92,7 @@ COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=ru-base /usr/local/share/uhd/rfnoc/ . COPY --from=ru-base /usr/local/share/uhd/rfnoc/ .
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.rhel8.2
View file @ 28da113c
...@@ -64,17 +64,16 @@ COPY --from=lte-ue-build \ ...@@ -64,17 +64,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/
COPY --from=lte-ue-base \ COPY --from=lte-ue-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.9 \
...@@ -103,9 +102,7 @@ COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt ...@@ -103,9 +102,7 @@ COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt
WORKDIR /usr/local/share/uhd/rfnoc WORKDIR /usr/local/share/uhd/rfnoc
COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ . COPY --from=lte-ue-base /usr/local/share/uhd/rfnoc/ .
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.rhel8.2
View file @ 28da113c
...@@ -64,20 +64,19 @@ COPY --from=nr-ue-build \ ...@@ -64,20 +64,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/
COPY --from=nr-ue-base \ COPY --from=nr-ue-base \
/lib64/libconfig.so.9 \ /lib64/libconfig.so.9 \
...@@ -107,9 +106,7 @@ COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/ ...@@ -107,9 +106,7 @@ COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/
WORKDIR /usr/local/share/uhd/rfnoc 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_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.phySim.rhel8.2
View file @ 28da113c
...@@ -69,7 +69,6 @@ COPY --from=phy-sim-build \ ...@@ -69,7 +69,6 @@ COPY --from=phy-sim-build \
/oai-ran/targets/bin/smallblocktest.Rel15 \ /oai-ran/targets/bin/smallblocktest.Rel15 \
./ ./
WORKDIR /usr/local/lib/
COPY --from=phy-sim-build \ COPY --from=phy-sim-build \
/oai-ran/targets/bin/libcoding.so \ /oai-ran/targets/bin/libcoding.so \
/lib64/liblapacke.so.3 \ /lib64/liblapacke.so.3 \
...@@ -86,7 +85,7 @@ COPY --from=phy-sim-build \ ...@@ -86,7 +85,7 @@ COPY --from=phy-sim-build \
/oai-ran/cmake_targets/phy_simulators/build/libSIMU.so \ /oai-ran/cmake_targets/phy_simulators/build/libSIMU.so \
/oai-ran/cmake_targets/phy_simulators/build/libldpc.so \ /oai-ran/cmake_targets/phy_simulators/build/libldpc.so \
/oai-ran/cmake_targets/phy_simulators/build/libldpc_orig.so \ /oai-ran/cmake_targets/phy_simulators/build/libldpc_orig.so \
./ /usr/local/lib/
RUN ldconfig RUN ldconfig
......
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