docker: fix dpdk installation

Author: asaezper

.gitlab/ci/build.yml

@@ -206,7 +206,7 @@ variables:
 
         if [ -n "${DPDK_VERSION}" ]; then
           BUILD_CMD="-d ${DPDK_VERSION} ${BUILD_CMD}"
-          export LD_LIBRARY_PATH=/opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/
+          export LD_LIBRARY_PATH=/opt/dpdk/${DPDK_VERSION}/lib/x86_64-linux-gnu/:/opt/dpdk/${DPDK_VERSION}/lib/aarch64-linux-gnu/:${LD_LIBRARY_PATH}
         fi
         if [ -n "${UHD_VERSION}" ]; then
           BUILD_CMD="-u ${UHD_VERSION} ${BUILD_CMD}"

docker/Dockerfile

@@ -54,6 +54,7 @@ RUN if [ -z "$NUM_CORES" ]; then NUM_CORES=$(nproc); fi && \
     -DBUILD_TESTS=True \
     -DENABLE_${LIB_UPPER}=On \
     -DCMAKE_CXX_FLAGS="-march=${ARCH}" \
+    -DCMAKE_INSTALL_PREFIX=/opt/srs \
     ${EXTRA_CMAKE_ARGS} /src
 
 # Copy extra binaries
@@ -69,12 +70,14 @@ ARG LIB
 ARG LIB_VERSION
 
 # Copy srsRAN binaries and libraries installed in previous stage
-COPY --from=builder /opt/${LIB}/${LIB_VERSION} /usr/local
-COPY --from=builder /usr/local /usr/local
+COPY --from=builder /opt/${LIB}/${LIB_VERSION} /opt/${LIB}/${LIB_VERSION}
+COPY --from=builder /opt/srs /usr/local
 
 # Copy the install dependencies scripts
 ADD docker/scripts/install_${LIB}_dependencies.sh /usr/local/etc/install_lib_dependencies.sh
 ADD docker/scripts/install_dependencies.sh /usr/local/etc/install_srsran_dependencies.sh
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/${LIB}/${LIB_VERSION}/lib/:/opt/${LIB}/${LIB_VERSION}/lib/x86_64-linux-gnu/:/opt/${LIB}/${LIB_VERSION}/lib/aarch64-linux-gnu/
+ENV PATH=$PATH:/opt/${LIB}/${LIB_VERSION}/bin/
 
 # Install srsran and lib runtime dependencies
 RUN /usr/local/etc/install_srsran_dependencies.sh run && \

docker/scripts/install_dpdk_dependencies.sh

@@ -33,7 +33,7 @@ main() {
         fi
         if [[ "$mode" == "all" || "$mode" == "run" ]]; then
             DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends \
-                python3-pip libnuma-dev pciutils libfdt-dev
+                python3-pip libnuma-dev pciutils libfdt-dev libatomic1
             pip3 install pyelftools || pip3 install --break-system-packages pyelftools
         fi
     else

docker/scripts/install_uhd_dependencies.sh

@@ -38,7 +38,7 @@ main() {
                 cpufrequtils inetutils-tools libboost-all-dev libncurses5-dev libusb-1.0-0 libusb-1.0-0-dev \
                 libusb-dev python3-dev python3-requests &&
                 apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/*
-            /usr/local/bin/uhd_images_downloader
+            uhd_images_downloader
         fi
     else
         echo "OS $ID not supported"