Merge branch 'dockerfile' into 'develop'

Changed config parameters for NRF and UPF

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

docker/Dockerfile.smf.rhel8.2

@@ -37,14 +37,14 @@ COPY tmp/entitlement/*.pem /etc/pki/entitlement
 
 RUN rm -f /etc/rhsm-host && \
     yum repolist --disablerepo=* && \
-    subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms && \	
+    subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms && \   
     yum update -y && \
     yum install -y \
-    	psmisc \
-    	git \
-	diffutils \
-	file && \
-  	rm -rf /var/lib/apt/lists/* 
+        psmisc \
+        git \
+    diffutils \
+    file && \
+    rm -rf /var/lib/apt/lists/* 
 
 # 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"
@@ -76,7 +76,6 @@ 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 \
     psmisc \
     net-tools \
     libevent && \
@@ -111,5 +110,6 @@ WORKDIR /openair-smf
 # expose ports
 EXPOSE 80/tcp 9090/tcp 8805/udp
 
-CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
 ENTRYPOINT ["/openair-smf/bin/entrypoint.sh"]
+
+CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]

docker/Dockerfile.ubuntu18.04

@@ -33,8 +33,7 @@ FROM ubuntu:bionic as oai-smf-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 \
@@ -60,12 +59,11 @@ RUN ./build_smf --clean --Verbose --build-type Release --jobs
 FROM ubuntu:bionic as oai-smf
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # 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 \
-    tzdata \
     psmisc \
     net-tools \
+    tzdata \
     bc \
     tshark \
     libasan4 \
@@ -79,7 +77,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DE
 WORKDIR /openair-smf/bin
 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/
@@ -94,8 +91,8 @@ COPY --from=oai-smf-builder /openair-smf/etc/smf.conf .
 
 WORKDIR /openair-smf
 
-# expose ports
 EXPOSE 80/tcp 9090/tcp 8805/udp
 
+ENTRYPOINT ["/bin/bash","/openair-smf/bin/entrypoint.sh"]
+
 CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
-ENTRYPOINT ["/openair-smf/bin/entrypoint.sh"]

etc/smf.conf

@@ -80,8 +80,8 @@ SMF =
     SUPPORT_FEATURES: 
     {
       # STRING, {"yes", "no"}, 
-      REGISTER_NRF = "no";  # Set to yes if SMF resgisters to an NRF
-      DISCOVER_UPF = "no";  # Set to yes to enable UPF discovery and selection
+      REGISTER_NRF = "@REGISTER_NRF@";  # Set to yes if SMF resgisters to an NRF
+      DISCOVER_UPF = "@DISCOVER_UPF@";  # Set to yes to enable UPF discovery and selection
       FORCE_PUSH_PROTOCOL_CONFIGURATION_OPTIONS = "no"; # Non standard feature, normally should be set to "no", 
                                                         # but you may need to set to yes for UE that do not explicitly request a PDN address through NAS signalling
       USE_LOCAL_SUBSCRIPTION_INFO = "yes";  # Set to yes if SMF uses local subscription information instead of from an UDM
@@ -103,9 +103,9 @@ SMF =
 
     NRF :
     {
-      IPV4_ADDRESS = "192.168.12.100";  # YOUR NRF CONFIG HERE
-      PORT         = 80;            # YOUR NRF CONFIG HERE (default: 80)
-      API_VERSION  = "v1";   # YOUR NRF API VERSION FOR SBI CONFIG HERE
+      IPV4_ADDRESS = "@NRF_IPV4_ADDRESS@";  # YOUR NRF CONFIG HERE
+      PORT         = @NRF_PORT@;            # YOUR NRF CONFIG HERE (default: 80)
+      API_VERSION  = "@NRF_API_VERSION@";   # YOUR NRF API VERSION FOR SBI CONFIG HERE
     };
         
     UPF_LIST = (

scripts/entrypoint.sh

@@ -3,18 +3,18 @@
 set -euo pipefail
 
 CONFIG_DIR="/openair-smf/etc"
-PUSH_PROTOCOL_OPTION=${PUSH_PROTOCOL_OPTION:-no}
 
 for c in ${CONFIG_DIR}/*.conf; do
     # grep variable names (format: ${VAR}) from template to be rendered
     VARS=$(grep -oP '@[a-zA-Z0-9_]+@' ${c} | sort | uniq | xargs)
+    echo "Now setting these variables '${VARS}'"
 
     # create sed expressions for substituting each occurrence of ${VAR}
     # with the value of the environment variable "VAR"
     EXPRESSIONS=""
     for v in ${VARS}; do
-	NEW_VAR=`echo $v | sed -e "s#@##g"`
-        if [[ "${!NEW_VAR}x" == "x" ]]; then
+        NEW_VAR=`echo $v | sed -e "s#@##g"`
+        if [[ -z ${!NEW_VAR+x} ]]; then
             echo "Error: Environment variable '${NEW_VAR}' is not set." \
                 "Config file '$(basename $c)' requires all of $VARS."
             exit 1
@@ -26,5 +26,5 @@ for c in ${CONFIG_DIR}/*.conf; do
     # render template and inline replace config file
     sed -i "${EXPRESSIONS}" ${c}
 done
-
+echo "Done setting the configuration"
 exec "$@"