Merge branch 'try-flattening-image' into 'develop'

feat(ci): flatten image to one layer to reduce image to the max

See merge request oai/cn5g/oai-cn5g-udr!18

ci-scripts/checkCodingFormattingRules.sh

@@ -139,6 +139,16 @@ then
     exit 1
 fi
 
+# When running in a container, in /home folder
+IS_CONTAINER=`egrep -c "docker|kubepods|podman|buildah|libpod" /proc/self/cgroup || true`
+if [ $IS_CONTAINER -ne 0 ]
+then
+    if [ $PWD = "/home/src" ]
+    then
+       git config --global --add safe.directory /home
+    fi
+fi
+
 # Merge request scenario
 
 MERGE_COMMMIT=`git log -n1 --pretty=format:%H`

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

@@ -58,9 +58,9 @@ RUN apt-get update && \
       net-tools \
       tzdata \
       bc \
-      tshark \
       libmysqlclient20 \
       libasan4 \
+      libgssapi-krb5-2 \
       libpsl5 \
       librtmp1 \
       libldap-2.4-2 \
@@ -81,6 +81,7 @@ COPY --from=oai-udr-builder \
 
 COPY --from=oai-udr-builder \
     /usr/local/lib/libpistache.so \
+    /usr/local/lib/libnghttp2.so.14 \
     /usr/local/lib/libnghttp2_asio.so.1 \
     /usr/lib/libboost_system.so.1.67.0 \
     /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 \

ci-scripts/flatten_image.py

@@ -20,12 +20,14 @@
 """
 
 import argparse
+import re
+import subprocess
 import sys
 
 def main() -> None:
     args = _parse_args()
-    print (f'Does nothing for the moment on {args.tag}')
-    sys.exit(0)
+    status = perform_flattening(args.tag)
+    sys.exit(status)
 
 def _parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description='Flattening Image')
@@ -38,5 +40,53 @@ def _parse_args() -> argparse.Namespace:
     )
     return parser.parse_args()
 
+def perform_flattening(tag):
+    # First detect which docker/podman command to use
+    cli = ''
+    image_prefix = ''
+    cmd = 'which podman || true'
+    podman_check = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+    if re.search('podman', podman_check.strip()):
+        cli = 'sudo podman'
+        image_prefix = 'localhost/'
+    if cli == '':
+        cmd = 'which docker || true'
+        docker_check = subprocess.check_output(cmd, shell=True, universal_newlines=True)
+        if re.search('docker', docker_check.strip()):
+            cli = 'docker'
+            image_prefix = ''
+    if cli == '':
+        print ('No docker / podman installed: quitting')
+        return -1
+    print (f'Flattening {tag}')
+    # Creating a container
+    cmd = cli + ' run --name test-flatten --entrypoint /bin/true -d ' + tag
+    print (cmd)
+    subprocess.check_output(cmd, shell=True, universal_newlines=True)
+
+    # Export / Import trick
+    cmd = cli + ' export test-flatten | ' + cli + ' import '
+    # Bizarro syntax issue with podman
+    if cli == 'docker':
+      cmd += ' --change "ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" '
+    else:
+      cmd += ' --change "ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" '
+    cmd += ' --change "WORKDIR /openair-udr" '
+    cmd += ' --change "EXPOSE 80/tcp" '
+    cmd += ' --change "CMD [\\"/openair-udr/bin/oai_udr\\", \\"-c\\", \\"/openair-udr/etc/udr.conf\\", \\"-o\\"]" '
+    cmd += ' --change "ENTRYPOINT [\\"/bin/bash\\", \\"/openair-udr/bin/entrypoint.sh\\"]" '
+    cmd += ' - ' + image_prefix + tag
+    print (cmd)
+    subprocess.check_output(cmd, shell=True, universal_newlines=True)
+
+    # Remove container
+    cmd = cli + ' rm -f test-flatten'
+    print (cmd)
+    subprocess.check_output(cmd, shell=True, universal_newlines=True)
+
+    # At this point the original image is a dangling image.
+    # CI pipeline will clean up (`image prune --force`)
+    return 0
+
 if __name__ == '__main__':
     main()

docker/Dockerfile.udr.rhel8

@@ -95,7 +95,7 @@ RUN yum update -y && \
       libasan \
       libevent && \
     yum clean all -y && \
-    rm -rf /var/cache/yum && \
+    rm -rf /var/cache/yum /var/cache/dnf && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 

docker/Dockerfile.udr.ubuntu18

@@ -76,9 +76,9 @@ RUN apt-get update && \
       net-tools \
       tzdata \
       bc \
-      tshark \
       libmysqlclient20 \
       libasan4 \
+      libgssapi-krb5-2 \
       libpsl5 \
       librtmp1 \
       libldap-2.4-2 \
@@ -99,6 +99,7 @@ COPY --from=oai-udr-builder \
 
 COPY --from=oai-udr-builder \
     /usr/local/lib/libpistache.so \
+    /usr/local/lib/libnghttp2.so.14 \
     /usr/local/lib/libnghttp2_asio.so.1 \
     /usr/lib/libboost_system.so.1.67.0 \
     /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 \