Merge branch 'libboost_ppa_fix' into 'fqdn_dns'

libboost version fix

See merge request oai/cn5g/oai-cn5g-smf!75

build/scripts/build_helper.fb_folly

@@ -68,7 +68,7 @@ install_fb_folly_from_source(){
       $SUDO $INSTALLER install $OPTION \
         g++ \
         libevent-dev \
-#       libboost1.67-dev \
+        libboost1.67-dev \
         libdouble-conversion-dev \
         libgoogle-glog-dev \
         libgflags-dev \

build/scripts/build_helper.smf

@@ -401,9 +401,9 @@ check_install_smf_deps() {
         # 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 
+        $SUDO add-apt-repository ppa:mhier/libboost-latest --yes
+        $SUDO $INSTALLER update
+        #var_ubuntu_18_04=1 
         specific_packages="libconfig++-dev"        
       ;;
       *)

docker/Dockerfile.smf.ubuntu18

@@ -68,6 +68,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DE
     tzdata \
     bc \
     tshark \
+    libconfig++-dev \
     libasan4 \
     libgoogle-glog0v5 \
     libdouble-conversion1 \
@@ -81,10 +82,10 @@ COPY --from=oai-smf-builder /openair-smf/build/smf/build/smf oai_smf
 COPY --from=oai-smf-builder /openair-smf/scripts/entrypoint.sh entrypoint.sh
 COPY --from=oai-smf-builder /usr/local/lib/libpistache.so /usr/local/lib/
 COPY --from=oai-smf-builder /usr/local/lib/libnghttp2_asio.so.1 /usr/local/lib/
-COPY --from=oai-smf-builder /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 /usr/lib/x86_64-linux-gnu/
-COPY --from=oai-smf-builder /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 /usr/lib/x86_64-linux-gnu/
-#COPY --from=oai-smf-builder /usr/lib/libboost_system.so.1.67.0 /usr/local/lib/
-#COPY --from=oai-smf-builder /usr/lib/libboost_thread.so.1.67.0 /usr/local/lib/
+#COPY --from=oai-smf-builder /usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 /usr/lib/x86_64-linux-gnu/
+#COPY --from=oai-smf-builder /usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 /usr/lib/x86_64-linux-gnu/
+COPY --from=oai-smf-builder /usr/lib/libboost_system.so.1.67.0 /usr/local/lib/
+COPY --from=oai-smf-builder /usr/lib/libboost_thread.so.1.67.0 /usr/local/lib/
 COPY --from=oai-smf-builder /openair-smf/build/smf/build/nas/libNAS.so /usr/local/lib/
 RUN ldconfig