Merge branch 'libboost_fix_for_docker' into 'fqdn_dns'

libboost fix for docker

See merge request oai/cn5g/oai-cn5g-amf!27

build/scripts/build_helper.amf

@@ -351,16 +351,21 @@ check_install_amf_deps(){
   echo "Install build tools"
   $SUDO $INSTALLER install $OPTION $PACKAGE_LIST
   ret=$?;[[ $ret -ne 0 ]] && return $ret
-
+  
   # Libraries
   if [[ $OS_DISTRO == "ubuntu" ]]; then
     case "$(get_distribution_release)" in
       "ubuntu18.04")
-      var_ubuntu_18_04=1   
+      # Currently Ubuntu18.04 has boost 1.65 as the latest
+      # We need at least 1.66
+      # PPA has 1.67
+      $SUDO add-apt-repository ppa:mhier/libboost-latest --yes
+      $SUDO $INSTALLER update
+      #var_ubuntu_18_04=1 
       if [ $IS_CONTAINER -eq 0 ]; then
         specific_packages="libconfig++-dev libasio-dev libboost-all-dev mysql-server"
       else
-        specific_packages="libconfig++-dev libasio-dev libboost-all-dev"
+        specific_packages="libconfig++-dev"
       fi
         ;;
       *)
@@ -374,10 +379,10 @@ check_install_amf_deps(){
     # removed libspdlog-dev
     PACKAGE_LIST="\
       $specific_packages \
+      libboost1.67-dev \
       mysql-server \
       mysql-client \
       libmysqlclient-dev \
-      libcpprest-dev \
       guile-2.0-dev \
       libcurl4-gnutls-dev \
       libevent-dev \
@@ -436,8 +441,8 @@ check_install_amf_deps(){
   ret=$?;[[ $ret -ne 0 ]] && return $ret
   
   # Use fmt lib included in spdlog
-  install_fmt $1
-  ret=$?;[[ $ret -ne 0 ]] && return $ret
+  # install_fmt $1
+  # ret=$?;[[ $ret -ne 0 ]] && return $ret
 
   install_spdlog_from_git $1 $2
   ret=$?;[[ $ret -ne 0 ]] && return $ret 

docker/Dockerfile.amf.ubuntu18

@@ -37,6 +37,7 @@ ENV TZ=Europe
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     psmisc \
+    software-properties-common \
     git \
     vim \
   && rm -rf /var/lib/apt/lists/*
@@ -69,6 +70,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DE
     tzdata \
     psmisc \
     net-tools \
+    libconfig++-dev \
     bc \
     tshark \
     libconfig++9v5 \
@@ -83,8 +85,9 @@ COPY --from=oai-amf-builder /openair-amf/scripts/entrypoint.sh entrypoint.sh
 WORKDIR /usr/lib/x86_64-linux-gnu
 COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libmysqlclient.so.20 .
 COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 .
-#COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 .
-COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcpprest.so.2.10 .
+COPY --from=oai-amf-builder /usr/lib/libboost_system.so.1.67.0 .
+COPY --from=oai-amf-builder /usr/lib/libboost_thread.so.1.67.0 .
+#COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcpprest.so.2.10 .
 COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 .
 COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libssl.so.1.1 .
 COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/librtmp.so.1 .