Commit b8012a98 authored by Raphael Defosseux's avatar Raphael Defosseux

chore(build): no need for atlas reference in Ubuntu images

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 514537e6
...@@ -44,4 +44,7 @@ RUN /bin/sh oaienv && \ ...@@ -44,4 +44,7 @@ RUN /bin/sh oaienv && \
--noavx512 \ --noavx512 \
--cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \ --cmake-opt -DCMAKE_C_FLAGS="-Werror" --cmake-opt -DCMAKE_CXX_FLAGS="-Werror" $BUILD_OPTION && \
# Mainly to see if the sanitize option was perfectly executed # Mainly to see if the sanitize option was perfectly executed
ldd ran_build/build/nr-softmodem echo "---- ldd on executables ----" && \
ldd ran_build/build/*softmodem* ran_build/build/nr-cuup ran_build/build/oairu && \
echo "---- ldd on shared libraries ----" && \
ldd ran_build/build/*.so
...@@ -52,7 +52,6 @@ RUN apt-get update && \ ...@@ -52,7 +52,6 @@ RUN apt-get update && \
libboost-program-options1.74.0 \ libboost-program-options1.74.0 \
tzdata \ tzdata \
libblas3 \ libblas3 \
libatlas3-base \
libconfig9 \ libconfig9 \
openssl \ openssl \
net-tools \ net-tools \
...@@ -111,7 +110,18 @@ COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai- ...@@ -111,7 +110,18 @@ COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-
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" && \
/bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \ /bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \
ldconfig && \ ldconfig && \
ldd /opt/oai-enb/bin/lte-softmodem echo "---- ldd on lte-softmodem ----" && \
ldd /opt/oai-enb/bin/lte-softmodem && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \
/usr/local/lib/liboai_iqplayer.so \
/usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_enb.so \
/usr/local/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-enb WORKDIR /opt/oai-enb
......
...@@ -69,7 +69,7 @@ RUN apt-get update && \ ...@@ -69,7 +69,7 @@ RUN apt-get update && \
procps \ procps \
libsctp1 \ libsctp1 \
tzdata \ tzdata \
libatlas3-base \ libblas3 \
libconfig9 \ libconfig9 \
openssl \ openssl \
net-tools \ net-tools \
...@@ -95,6 +95,14 @@ COPY --from=ran-build \ ...@@ -95,6 +95,14 @@ COPY --from=ran-build \
/usr/local/lib/libnvipc.so \ /usr/local/lib/libnvipc.so \
/usr/local/lib/ /usr/local/lib/
RUN ldconfig && \
echo "---- ldd on nr-softmodem ----" && \
ldd /opt/oai-gnb/bin/nr-softmodem && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libfmtlog-shared.so \
/usr/local/lib/libnvlog.so \
/usr/local/lib/libnvipc.so
WORKDIR /opt/oai-gnb WORKDIR /opt/oai-gnb
COPY --from=ran-build /tini /tini COPY --from=ran-build /tini /tini
......
...@@ -49,7 +49,7 @@ RUN apt-get update && \ ...@@ -49,7 +49,7 @@ RUN apt-get update && \
libsctp1 \ libsctp1 \
tzdata \ tzdata \
libblas3 \ libblas3 \
libatlas3-base \ libc6 \
libconfig9 \ libconfig9 \
gdb \ gdb \
openssl \ openssl \
...@@ -78,7 +78,18 @@ COPY --from=gnb-build \ ...@@ -78,7 +78,18 @@ COPY --from=gnb-build \
RUN /bin/bash -c "ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so" && \ RUN /bin/bash -c "ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so" && \
/bin/bash -c "ln -s /usr/local/lib/liboai_eth_transpro.so /usr/local/lib/liboai_transpro.so" && \ /bin/bash -c "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 shared libraries ----" && \
ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \
/usr/local/lib/libaw2sori_transpro.so \
/usr/local/lib/libcoding.so \
/usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \
/usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so
WORKDIR /opt/oai-gnb-aw2s WORKDIR /opt/oai-gnb-aw2s
......
...@@ -52,7 +52,6 @@ RUN apt-get update && \ ...@@ -52,7 +52,6 @@ RUN apt-get update && \
libboost-program-options1.74.0 \ libboost-program-options1.74.0 \
tzdata \ tzdata \
libblas3 \ libblas3 \
libatlas3-base \
libconfig9 \ libconfig9 \
openssl \ openssl \
net-tools \ net-tools \
...@@ -103,7 +102,19 @@ COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai- ...@@ -103,7 +102,19 @@ COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-
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 && \
ldd /opt/oai-gnb/bin/nr-softmodem echo "---- ldd on nr-softmodem ----" && \
ldd /opt/oai-gnb/bin/nr-softmodem && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libcoding.so \
/usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \
/usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_ci.so \
/usr/local/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-gnb WORKDIR /opt/oai-gnb
#EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 2152/udp # S1U, GTP/UDP
......
...@@ -42,7 +42,6 @@ RUN apt-get update && \ ...@@ -42,7 +42,6 @@ RUN apt-get update && \
procps \ procps \
software-properties-common \ software-properties-common \
libblas3 \ libblas3 \
libatlas3-base \
libconfig9 \ libconfig9 \
net-tools \ net-tools \
gdb \ gdb \
...@@ -83,7 +82,16 @@ COPY --from=ru-base \ ...@@ -83,7 +82,16 @@ COPY --from=ru-base \
/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" && \
ldconfig ldconfig && \
echo "---- ldd on oairu ----" && \
ldd /opt/oai-lte-ru/bin/oairu && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \
/usr/local/lib/libuhd.so.4.4.0
WORKDIR /opt/oai-lte-ru WORKDIR /opt/oai-lte-ru
......
...@@ -52,7 +52,7 @@ RUN apt-get update && \ ...@@ -52,7 +52,7 @@ RUN apt-get update && \
libboost-program-options1.74.0 \ libboost-program-options1.74.0 \
tzdata \ tzdata \
liblapacke \ liblapacke \
libatlas3-base \ libblas3 \
libconfig9 \ libconfig9 \
openssl \ openssl \
net-tools \ net-tools \
...@@ -112,7 +112,17 @@ COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/o ...@@ -112,7 +112,17 @@ COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/o
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 && \
ldd /opt/oai-lte-ue/bin/lte-uesoftmodem echo "---- ldd on lte-uesoftmodem ----" && \
ldd /opt/oai-lte-ue/bin/lte-uesoftmodem && \
echo "---- ldd on shared librarues ----" && \
ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libcoding.so \
/usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \
/usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libuhd.so.4.4.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
......
...@@ -52,7 +52,7 @@ RUN apt-get update && \ ...@@ -52,7 +52,7 @@ RUN apt-get update && \
libboost-program-options1.74.0 \ libboost-program-options1.74.0 \
tzdata \ tzdata \
liblapacke \ liblapacke \
libatlas3-base \ libblas3 \
libconfig9 \ libconfig9 \
openssl \ openssl \
net-tools \ net-tools \
...@@ -106,7 +106,20 @@ COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oa ...@@ -106,7 +106,20 @@ COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oa
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 && \
ldd /opt/oai-nr-ue/bin/nr-uesoftmodem echo "---- ldd on nr-uesoftmodem ----" && \
ldd /opt/oai-nr-ue/bin/nr-uesoftmodem && \
echo "---- ldd on shared libraries ----" && \
ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/libcoding.so \
/usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \
/usr/local/lib/libldpc*.so \
/usr/local/lib/libtelnetsrv.so \
/usr/local/lib/libtelnetsrv_ciUE.so \
/usr/local/lib/libtelnetsrv_5Gue.so \
/usr/local/lib/libuhd.so.4.4.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
......
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