changes in dockerfile and conf file

- Added tzdata in ubuntu image TZ=Europe/Paris
- Added TZ in RHEL8.2 image
- Added two NF_REGISTRATION and SMF_SELECTION variables in conf

docker/Dockerfile.amf.rhel8.2

@@ -35,10 +35,6 @@ ARG NEEDED_GIT_PROXY
 COPY tmp/ca/redhat-uep.pem /etc/rhsm/ca
 COPY tmp/entitlement/*.pem /etc/pki/entitlement
 
-#ENV DEBIAN_FRONTEND=noninteractive
-#ENV TZ=Europe
-#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
 RUN rm -f /etc/rhsm-host && \
     yum repolist --disablerepo=* && \
     subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms && \
@@ -81,7 +77,7 @@ RUN ./build_amf --clean --Verbose --build-type Release --jobs
 # TARGET IMAGE
 #---------------------------------------------------------------------
 FROM registry.access.redhat.com/ubi8/ubi:latest as oai-amf
-
+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" \
@@ -128,8 +124,6 @@ WORKDIR /openair-amf
 # expose ports
 EXPOSE 80/tcp 9090/tcp 38412/sctp
 
-CMD ["/openair-amf/bin/oai_amf", "-c", "/openair-amf/etc/amf.conf", "-o"]
-
 ENTRYPOINT ["/openair-amf/bin/entrypoint.sh"]
 
-#CMD ["sleep", "infinity"]
\ No newline at end of file
+CMD ["/openair-amf/bin/oai_amf", "-c", "/openair-amf/etc/amf.conf", "-o"]
\ No newline at end of file

docker/Dockerfile.ubuntu.18.04

@@ -33,8 +33,6 @@ FROM ubuntu:bionic as oai-amf-builder
 ARG NEEDED_GIT_PROXY
 
 ENV DEBIAN_FRONTEND=noninteractive
-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 \
     git \
@@ -62,13 +60,13 @@ RUN ./build_amf --clean --Verbose --build-type Release --jobs
 #---------------------------------------------------------------------
 FROM ubuntu:bionic as oai-amf
 ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=Europe
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+ENV TZ=Europe/Paris
 # We install some debug tools for the moment in addition of mandatory libraries
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     psmisc \
     net-tools \
     bc \
+    tzdata \
     tshark \
     libconfig++9v5 \
     libsctp1 \

etc/amf.conf

@@ -100,8 +100,8 @@ AMF =
   SUPPORT_FEATURES: 
   {
      # STRING, {"yes", "no"}, 
-     NF_REGISTRATION = "no";  # Set to yes if AMF resgisters to an NRF
-     SMF_SELECTION   = "no";  # Set to yes to enable SMF discovery and selection
+     NF_REGISTRATION = "@NF_REGISTRATION@";  # Set to yes if AMF resgisters to an NRF
+     SMF_SELECTION   = "@SMF_SELECTION@";  # Set to yes to enable SMF discovery and selection
      EXTERNAL_AUSF   = "no";  # Set to yes if AMF works with an external AUSF
      EXTERNAL_UDM    = "no";  # Set to yes if AMF works with an external UDM
   }