Merge branch 'docker-opt' into 'develop'

docker(build): optimization on the number of layers

See merge request oai/cn5g/oai-cn5g-udm!14

ci-scripts/docker/Dockerfile.ci.ubuntu.18.04

@@ -36,7 +36,9 @@ RUN cp -Rf /openair-udm-ext-ref /openair-udm/build/ext
 
 # Building UDM
 WORKDIR /openair-udm/build/scripts
-RUN ./build_udm --clean --Verbose --build-type Release --jobs
+RUN ./build_udm --clean --Verbose --build-type Release --jobs && \
+    ldd /openair-udm/build/udm/build/udm && \
+    mv /openair-udm/build/udm/build/udm /openair-udm/build/udm/build/oai_udm
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -66,15 +68,20 @@ RUN apt-get update && \
 
 # Copying executable and generated libraries
 WORKDIR /openair-udm/bin
-COPY --from=oai-udm-builder /openair-udm/build/udm/build/udm oai_udm
-COPY --from=oai-udm-builder /openair-udm/scripts/entrypoint.sh .
+COPY --from=oai-udm-builder \
+    /openair-udm/build/udm/build/oai_udm \
+    /openair-udm/scripts/entrypoint.sh \
+    ./
 
-COPY --from=oai-udm-builder /usr/local/lib/libpistache.so /usr/local/lib/
-COPY --from=oai-udm-builder /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 /usr/local/lib/
-COPY --from=oai-udm-builder /usr/lib/libboost_system.so.1.67.0 /usr/local/lib/
-COPY --from=oai-udm-builder /usr/local/lib/libnghttp2_asio.so.1 /usr/local/lib/
+COPY --from=oai-udm-builder \
+    /usr/local/lib/libpistache.so \
+    /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 \
+    /usr/lib/libboost_system.so.1.67.0 \
+    /usr/local/lib/libnghttp2_asio.so.1 \
+    /usr/local/lib/
 
-RUN ldconfig
+RUN ldconfig && \
+    ldd /openair-udm/bin/oai_udm
 
 WORKDIR /openair-udm/etc
 COPY --from=oai-udm-builder /openair-udm/etc/udm.conf .

docker/Dockerfile.udm.rhel8

@@ -66,7 +66,9 @@ COPY . /openair-udm
 # Installing and Building UDM
 WORKDIR /openair-udm/build/scripts
 RUN ./build_udm --install-deps --force
-RUN ./build_udm --clean --Verbose --build-type Release --jobs
+RUN ./build_udm --clean --Verbose --build-type Release --jobs && \
+    ldd /openair-udm/build/udm/build/udm && \
+    mv /openair-udm/build/udm/build/udm /openair-udm/build/udm/build/oai_udm
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -92,21 +94,26 @@ RUN yum update -y && \
 
 # Copying executable and generated libraries
 WORKDIR /openair-udm/bin
-COPY --from=oai-udm-builder /openair-udm/build/udm/build/udm oai_udm
-COPY --from=oai-udm-builder /openair-udm/scripts/entrypoint.sh .
+COPY --from=oai-udm-builder \
+    /openair-udm/build/udm/build/oai_udm \
+    /openair-udm/scripts/entrypoint.sh \
+    ./
 
 WORKDIR /usr/local/lib64
-COPY --from=oai-udm-builder /usr/local/lib/libnghttp2_asio.so .
-COPY --from=oai-udm-builder /usr/lib64/libboost_chrono.so.1.66.0 .
-COPY --from=oai-udm-builder /usr/local/lib/libnghttp2_asio.so.1 .
-COPY --from=oai-udm-builder /usr/local/lib64/libpistache.so.0 .
-COPY --from=oai-udm-builder /lib64/libboost_system.so.1.66.0 .
-COPY --from=oai-udm-builder /lib64/libboost_thread.so.1.66.0 .
-COPY --from=oai-udm-builder /lib64/libboost_date_time.so.1.66.0 .
-COPY --from=oai-udm-builder /lib64/libconfig++.so.9 .
-COPY --from=oai-udm-builder /lib64/libnghttp2.so.14 .
+COPY --from=oai-udm-builder \
+    /usr/local/lib/libnghttp2_asio.so \
+    /usr/lib64/libboost_chrono.so.1.66.0 \
+    /usr/local/lib/libnghttp2_asio.so.1 \
+    /usr/local/lib64/libpistache.so.0 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/libboost_thread.so.1.66.0 \
+    /lib64/libboost_date_time.so.1.66.0 \
+    /lib64/libconfig++.so.9 \
+    /lib64/libnghttp2.so.14 \
+    ./
 
-RUN ldconfig
+RUN ldconfig && \
+    ldd /openair-udm/bin/oai_udm
 
 WORKDIR /openair-udm/etc
 COPY --from=oai-udm-builder /openair-udm/etc/udm.conf .

docker/Dockerfile.udm.ubuntu18

@@ -56,7 +56,9 @@ COPY . /openair-udm
 # Installing and Building UDM
 WORKDIR /openair-udm/build/scripts
 RUN ./build_udm --install-deps --force
-RUN ./build_udm --clean --Verbose --build-type Release --jobs
+RUN ./build_udm --clean --Verbose --build-type Release --jobs && \
+    ldd /openair-udm/build/udm/build/udm && \
+    mv /openair-udm/build/udm/build/udm /openair-udm/build/udm/build/oai_udm
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -86,15 +88,20 @@ RUN apt-get update && \
 
 # Copying executable and generated libraries
 WORKDIR /openair-udm/bin
-COPY --from=oai-udm-builder /openair-udm/build/udm/build/udm oai_udm
-COPY --from=oai-udm-builder /openair-udm/scripts/entrypoint.sh .
+COPY --from=oai-udm-builder \
+    /openair-udm/build/udm/build/oai_udm \
+    /openair-udm/scripts/entrypoint.sh \
+    ./
 
-COPY --from=oai-udm-builder /usr/local/lib/libpistache.so /usr/local/lib/
-COPY --from=oai-udm-builder /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 /usr/local/lib/
-COPY --from=oai-udm-builder /usr/lib/libboost_system.so.1.67.0 /usr/local/lib/
-cOPY --from=oai-udm-builder /usr/local/lib/libnghttp2_asio.so.1 /usr/local/lib/
+COPY --from=oai-udm-builder \
+    /usr/local/lib/libpistache.so \
+    /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 \
+    /usr/lib/libboost_system.so.1.67.0 \
+    /usr/local/lib/libnghttp2_asio.so.1 \
+    /usr/local/lib/
 
-RUN ldconfig
+RUN ldconfig && \
+    ldd /openair-udm/bin/oai_udm
 
 WORKDIR /openair-udm/etc
 COPY --from=oai-udm-builder /openair-udm/etc/udm.conf .