build(release): adding more verbosity to release mode

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

docker/Dockerfile.amf.rhel8

@@ -55,9 +55,9 @@ RUN rm -f /etc/rhsm-host && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 
 # Some GIT configuration command quite useful
-RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
-RUN git config --global https.postBuffer 123289600
-RUN git config --global http.sslverify false
+RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi" && \
+    git config --global https.postBuffer 123289600 && \
+    git config --global http.sslverify false
 
 # Copying source code
 WORKDIR /openair-amf/
@@ -70,7 +70,6 @@ RUN ./build_amf --install-deps --force
 # Building AMF
 WORKDIR /openair-amf/build/scripts
 RUN ./build_amf --clean --Verbose --build-type Release --jobs
-#RUN ./build_amf --clean --Verbose --build-type Debug --jobs
 
 #---------------------------------------------------------------------
 # TARGET IMAGE
@@ -80,14 +79,14 @@ ENV TZ=Europe/Paris
 # We install some debug tools for the moment in addition of mandatory libraries
 RUN yum update -y && \
     yum install -y --enablerepo="ubi-8-codeready-builder" \
-    tzdata \
-    procps-ng \
-    psmisc \
-    net-tools \
-    libevent && \
+      tzdata \
+      libasan \
+      procps-ng \
+      psmisc \
+      net-tools \
+      libevent && \
     rm -rf /var/lib/apt/lists/*
 
-
 # Copying executable and generated libraries
 WORKDIR /openair-amf/bin
 COPY --from=oai-amf-builder /openair-amf/build/amf/build/amf oai_amf
@@ -108,15 +107,9 @@ COPY --from=oai-amf-builder /usr/lib64/libboost_regex.so.1.66.0 /usr/lib64/
 COPY --from=oai-amf-builder /usr/lib64/libicudata.so.60 /usr/lib64/
 COPY --from=oai-amf-builder /usr/lib64/libicui18n.so.60 /usr/lib64/
 COPY --from=oai-amf-builder /usr/lib64/libicuuc.so.60 /usr/lib64/
-COPY --from=oai-amf-builder /usr/lib64/libasan.so.5.0.0 /usr/lib64/
-COPY --from=oai-amf-builder /usr/lib64/libasan.so.5 /usr/lib64/
 
 COPY --from=oai-amf-builder /openair-amf/scripts/entrypoint.sh entrypoint.sh
 
-# debug
-#RUN ldconfig -v
-#RUN ldd oai_amf
-
 # Copying template configuration files
 WORKDIR /openair-amf/etc
 COPY --from=oai-amf-builder /openair-amf/etc/amf.conf .
@@ -127,7 +120,4 @@ WORKDIR /openair-amf
 EXPOSE 80/tcp 9090/tcp 38412/sctp
 
 ENTRYPOINT ["/openair-amf/bin/entrypoint.sh"]
-
 CMD ["/openair-amf/bin/oai_amf", "-c", "/openair-amf/etc/amf.conf", "-o"]
-
-#CMD ["sleep", "infinity"]

docker/Dockerfile.amf.ubuntu18

@@ -33,7 +33,7 @@ FROM ubuntu:bionic as oai-amf-builder
 ARG NEEDED_GIT_PROXY
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=Europe
+ENV TZ=Europe/Paris
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
     DEBIAN_FRONTEND=noninteractive apt-get install --yes \
@@ -44,9 +44,9 @@ RUN apt-get update && \
   && rm -rf /var/lib/apt/lists/*
 
 # Some GIT configuration commands quite useful
-RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
-RUN git config --global https.postBuffer 123289600
-RUN git config --global http.sslverify false
+RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi" && \
+    git config --global https.postBuffer 123289600 && \
+    git config --global http.sslverify false
 
 WORKDIR /openair-amf/
 COPY . /openair-amf

src/oai-amf/CMakeLists.txt

@@ -122,6 +122,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
   SET(ASAN asan)
 endif()
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
+  add_boolean_option(LOG_OAI True "Thread safe logging API")
   SET(ASAN asan)
 endif()
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")