Merge pull request #48 from OPENAIRINTERFACE/docker-opt

feat(ci): cleanup on RHEL8 dockerfile
OPENAIRINTERFACE · Jan 28, 2022 · 729000e · 729000e
2 parents a5a0648 + 3b47e89
commit 729000e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 128 deletions.
diff --git a/docker/Dockerfile.rhel8 b/docker/Dockerfile.rhel8
@@ -59,7 +59,9 @@ COPY . /openair-spgwu-tiny
 # Installing and Building SPGW-U-TINY
 WORKDIR /openair-spgwu-tiny/build/scripts
 RUN ./build_spgwu --install-deps --force
-RUN ./build_spgwu --clean --build-type Release --jobs --Verbose
+RUN ./build_spgwu --clean --build-type Release --jobs --Verbose && \
+    ldd /openair-spgwu-tiny/build/spgw_u/build/spgwu && \
+    mv /openair-spgwu-tiny/build/spgw_u/build/spgwu /openair-spgwu-tiny/build/spgw_u/build/oai_spgwu
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -70,7 +72,6 @@ ENV TZ=Europe/Paris
 RUN yum update -y && \
     yum -y install --enablerepo="ubi-8-codeready-builder" \
       tzdata \
-      tcpdump \
       procps-ng \
       psmisc \
       net-tools \
@@ -84,16 +85,21 @@ RUN yum update -y && \
 
 # Copying executable and generated libraries
 WORKDIR /openair-spgwu-tiny/bin
-COPY --from=oai-spgwu-tiny-builder /openair-spgwu-tiny/build/spgw_u/build/spgwu oai_spgwu
-COPY --from=oai-spgwu-tiny-builder /openair-spgwu-tiny/scripts/entrypoint.sh .
+COPY --from=oai-spgwu-tiny-builder \
+    /openair-spgwu-tiny/build/spgw_u/build/oai_spgwu \
+    /openair-spgwu-tiny/scripts/entrypoint.sh \
+    ./
 
 # Copying installed libraries from builder
-COPY --from=oai-spgwu-tiny-builder /lib64/libgflags.so.2.1 /lib64/
-COPY --from=oai-spgwu-tiny-builder /lib64/libglog.so.0 /lib64/
-COPY --from=oai-spgwu-tiny-builder /lib64/libdouble-conversion.so.1 /lib64/
-COPY --from=oai-spgwu-tiny-builder /lib64/libconfig++.so.9 /lib64/
-COPY --from=oai-spgwu-tiny-builder /lib64/libboost_system.so.1.66.0 /lib64/
-RUN ldconfig
+COPY --from=oai-spgwu-tiny-builder \
+    /lib64/libgflags.so.2.1 \
+    /lib64/libglog.so.0 \
+    /lib64/libdouble-conversion.so.1 \
+    /lib64/libconfig++.so.9 \
+    /lib64/libboost_system.so.1.66.0 \
+    /lib64/
+RUN ldconfig && \
+    ldd /openair-spgwu-tiny/bin/oai_spgwu
 
 # Copying template configuration files
 # The configuration folder will be flat

diff --git a/docker/Dockerfile.rhel8-2.oc4-4 b/docker/Dockerfile.rhel8-2.oc4-4
diff --git a/docker/Dockerfile.ubuntu18.04 b/docker/Dockerfile.ubuntu18.04
@@ -55,7 +55,9 @@ COPY . /openair-spgwu-tiny
 # Installing and Building SPGW-U-TINY
 WORKDIR /openair-spgwu-tiny/build/scripts
 RUN ./build_spgwu --install-deps --force
-RUN ./build_spgwu --clean --build-type Release --jobs --Verbose
+RUN ./build_spgwu --clean --build-type Release --jobs --Verbose && \
+    ldd /openair-spgwu-tiny/build/spgw_u/build/spgwu && \
+    mv /openair-spgwu-tiny/build/spgw_u/build/spgwu /openair-spgwu-tiny/build/spgw_u/build/oai_spgwu
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -83,15 +85,20 @@ RUN apt-get update && \
 
 # Copying executable and generated libraries
 WORKDIR /openair-spgwu-tiny/bin
-COPY --from=oai-spgwu-tiny-builder /openair-spgwu-tiny/build/spgw_u/build/spgwu oai_spgwu
-COPY --from=oai-spgwu-tiny-builder /openair-spgwu-tiny/scripts/entrypoint.sh .
+COPY --from=oai-spgwu-tiny-builder \
+    /openair-spgwu-tiny/build/spgw_u/build/oai_spgwu \
+    /openair-spgwu-tiny/scripts/entrypoint.sh \
+    ./
 
 WORKDIR /usr/local/lib
-COPY --from=oai-spgwu-tiny-builder /usr/lib/libboost_system.so.1.67.0 .
-COPY --from=oai-spgwu-tiny-builder /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 .
-COPY --from=oai-spgwu-tiny-builder /usr/lib/x86_64-linux-gnu/librtmp.so.1 .
-COPY --from=oai-spgwu-tiny-builder /usr/lib/x86_64-linux-gnu/libpsl.so.5 .
-RUN ldconfig
+COPY --from=oai-spgwu-tiny-builder \
+    /usr/lib/libboost_system.so.1.67.0 \
+    /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 \
+    /usr/lib/x86_64-linux-gnu/librtmp.so.1 \
+    /usr/lib/x86_64-linux-gnu/libpsl.so.5 \
+    ./
+RUN ldconfig && \
+    ldd /openair-spgwu-tiny/bin/oai_spgwu
 
 # Copying template configuration files
 # The configuration folder will be flat

diff --git a/openshift/oai-spgwu-tiny-build-config.yml b/openshift/oai-spgwu-tiny-build-config.yml
@@ -45,7 +45,7 @@ spec:
             destinationDir: rhsm-ca
     strategy:
         dockerStrategy:
-            dockerfilePath: "docker/Dockerfile.rhel8-2.oc4-4"
+            dockerfilePath: "docker/Dockerfile.rhel8"
     output:
         to:
             kind: "ImageStreamTag"