BUILD: remove ue_ip is container-based build

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

cmake_targets/build_oai

@@ -661,9 +661,9 @@ function main() {
         compilations \
           $build_dir rb_tool \
           rb_tool $dbin/rb_tool
-      fi #IS_CONTAINER
 
-      cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin
+        cp $OPENAIR_DIR/cmake_targets/tools/init_nas_nos1 $dbin
+      fi #IS_CONTAINER
     fi
 
   fi
@@ -671,9 +671,16 @@ function main() {
   if [ "$UE" = 1 ] ; then
 
     echo_info "Compiling UE specific part"
-    compilations \
+
-      $build_dir ue_ip \
+    if [ $IS_CONTAINER -eq 0 ]
-      CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
+    then
+      echo_info "Building ue_ip module"
+      compilations \
+        $build_dir ue_ip \
+        CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
+    else
+      echo_info "Bypassing ue_ip build"
+    fi #IS_CONTAINER
 
 #    mkdir -p $DIR/at_commands/build
 #    cd $DIR/at_commands/build

docker/Dockerfile.lteUE.rhel8.2.oc4-4

@@ -38,8 +38,8 @@ RUN /bin/sh oaienv && \
 
 # debug
 RUN ldconfig -v && ldd /oai-ran/targets/bin/lte-uesoftmodem.Rel15
-RUN ls /oai-ran/targets/bin
+RUN ls -lst /oai-ran/targets/bin
-RUN ls /oai-ran/cmake_targets/ran_build/build/*.so
+RUN ls -lst /oai-ran/cmake_targets/ran_build/build/*.so
 
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ue
@@ -48,11 +48,18 @@ RUN yum update -y && \
     yum install -y --enablerepo="ubi-8-codeready-builder" \
         lksctp-tools \
         nettle \
+        atlas \
         libyaml && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf
 
 WORKDIR /opt/oai-lte-ue/bin
 COPY --from=lte-ue-build /oai-ran/targets/bin/lte-uesoftmodem.Rel15 .
+COPY --from=lte-ue-build /oai-ran/targets/bin/conf2uedata .
+COPY --from=lte-ue-build /oai-ran/targets/bin/nvram .
+COPY --from=lte-ue-build /oai-ran/targets/bin/usim .
+COPY --from=lte-ue-build /oai-ran/targets/bin/.ue_emm.nvram0 .
+COPY --from=lte-ue-build /oai-ran/targets/bin/.ue.nvram0 .
+COPY --from=lte-ue-build /oai-ran/targets/bin/.usim.nvram0 .
 
 WORKDIR /usr/local/lib/
 COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
@@ -61,15 +68,18 @@ COPY --from=lte-ue-build /oai-ran/targets/bin/librfsimulator.so.Rel15 .
 #COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 .
 COPY --from=lte-ue-build /oai-ran/targets/bin/libcoding.so .
 COPY --from=lte-ue-build /oai-ran/targets/bin/libparams_libconfig.so .
-#COPY --from=lte-ue-build /oai-ran/cmake_targets/ran_build/build/libSIMU.so .
+COPY --from=lte-ue-build /oai-ran/cmake_targets/ran_build/build/libSIMU.so .
 COPY --from=lte-ue-build /oai-ran/cmake_targets/ran_build/build/libdfts.so .
-COPY --from=lte-ue-build /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so .
 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.Rel15 /usr/local/lib/liboai_device.so"
 RUN /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so"
 
 COPY --from=lte-ue-build /usr/local/lib/libprotobuf-c.so.1 .
 
+COPY --from=lte-ue-build /lib64/libblas.so.3 /lib64
+COPY --from=lte-ue-build /lib64/liblapack.so.3 /lib64
+COPY --from=lte-ue-build /lib64/liblapacke.so.3 /lib64
+
 RUN ldconfig -v && ldd /opt/oai-lte-ue/bin/lte-uesoftmodem.Rel15
 
 # Copy the relevant configuration files for eNB

docker/Dockerfile.nrUE.rhel8.2.oc4-4

@@ -38,8 +38,8 @@ RUN /bin/sh oaienv && \
 
 # debug
 RUN ldconfig -v && ldd /oai-ran/targets/bin/nr-uesoftmodem.Rel15
-RUN ls /oai-ran/targets/bin
+RUN ls -lst /oai-ran/targets/bin
-RUN ls /oai-ran/cmake_targets/ran_build/build/*.so
+RUN ls -lst /oai-ran/cmake_targets/ran_build/build/*.so
 
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi8/ubi:latest as oai-nr-ue
@@ -48,6 +48,9 @@ RUN yum update -y && \
     yum install -y --enablerepo="ubi-8-codeready-builder" \
         lksctp-tools \
         nettle \
+        atlas \
+        libXpm \
+        libX11 \
         libyaml && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf
 
@@ -61,15 +64,22 @@ COPY --from=nr-ue-build /oai-ran/targets/bin/librfsimulator.so.Rel15 .
 #COPY --from=nr-ue-build /oai-ran/targets/bin/liboai_usrpdevif.so.Rel15 .
 COPY --from=nr-ue-build /oai-ran/targets/bin/libcoding.so .
 COPY --from=nr-ue-build /oai-ran/targets/bin/libparams_libconfig.so .
-#COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/libSIMU.so .
 COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/libdfts.so .
-COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so .
+COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/libldpc.so .
+COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so .
+COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so .
+COPY --from=nr-ue-build /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so .
 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.Rel15 /usr/local/lib/liboai_device.so"
 RUN /bin/bash -c "ln -s /usr/local/lib/librfsimulator.so.Rel15 /usr/local/lib/librfsimulator.so"
 
 COPY --from=nr-ue-build /usr/local/lib/libprotobuf-c.so.1 .
 
+COPY --from=nr-ue-build /lib64/libblas.so.3 /lib64
+COPY --from=nr-ue-build /lib64/liblapack.so.3 /lib64
+COPY --from=nr-ue-build /lib64/liblapacke.so.3 /lib64
+COPY --from=nr-ue-build /lib64/libforms.so.2 /lib64
+
 RUN ldconfig -v && ldd /opt/oai-nr-ue/bin/nr-uesoftmodem.Rel15
 
 # Copy the relevant configuration files for eNB