Merge branch 'dockerfile' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-smf into dockerfile

docker/Dockerfile.smf.rhel8.2

@@ -112,6 +112,7 @@ WORKDIR /openair-smf
 #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 ["sleep", "infinity"]
 
+#CMD ["sleep", "infinity"]
\ No newline at end of file

docker/Dockerfile.ubuntu.18.04

@@ -91,6 +91,15 @@ COPY --from=oai-smf-builder /openair-smf/etc/smf.conf .
 
 WORKDIR /openair-smf
 
+<<<<<<< HEAD:docker/Dockerfile.ubuntu.18.04
 ENTRYPOINT ["/bin/bash","/openair-smf/bin/entrypoint.sh"]
 
 CMD ["/openair-smf/bin/oai_smf", "-c", "/openair-smf/etc/smf.conf", "-o"]
+=======
+# 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"]
+>>>>>>> 2409d789898b1ac60fcc6f7d0e2a67cafb66f3ba:docker/Dockerfile.ubuntu.18.04

scripts/entrypoint.sh

@@ -13,7 +13,11 @@ for c in ${CONFIG_DIR}/*.conf; do
     # with the value of the environment variable "VAR"
     EXPRESSIONS=""
     for v in ${VARS}; do
+<<<<<<< HEAD
         NEW_VAR=`echo $v | sed -e "s#@##g"`
+=======
+    NEW_VAR=`echo $v | sed -e "s#@##g"`
+>>>>>>> 2409d789898b1ac60fcc6f7d0e2a67cafb66f3ba
         if [[ -z ${!NEW_VAR+x} ]]; then
             echo "Error: Environment variable '${NEW_VAR}' is not set." \
                 "Config file '$(basename $c)' requires all of $VARS."
@@ -27,4 +31,8 @@ for c in ${CONFIG_DIR}/*.conf; do
     sed -i "${EXPRESSIONS}" ${c}
 done
 echo "Done setting the configuration"
+<<<<<<< HEAD
 exec "$@"
+=======
+exec "$@"
+>>>>>>> 2409d789898b1ac60fcc6f7d0e2a67cafb66f3ba