[CI] moved image build into a separate class

also first docker-compose for a monolithic eNB

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

docker/Dockerfile.eNB.ubuntu18

@@ -38,7 +38,7 @@ RUN /bin/sh oaienv && \
 
 RUN apt-get install -y python3-pip && \
     pip3 install --ignore-installed pyyaml && \
-    python3 ./docker/scripts/generateTemplate.py ./docker/scripts/parameters.yaml
+    python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml
 
 # debug
 #RUN ldconfig -v && ldd /oai-ran/targets/bin/lte-softmodem.Rel15

docker/scripts/enb_entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-# Based another env var
+# Based another env var, pick one template to use
 if [[ -v USE_FDD_CU ]]; then ln -s /opt/oai-enb/etc/cu.fdd.conf /opt/oai-enb/etc/enb.conf; fi
 if [[ -v USE_FDD_DU ]]; then ln -s /opt/oai-enb/etc/du.fdd.conf /opt/oai-enb/etc/enb.conf; fi
 if [[ -v USE_FDD_MONO ]]; then ln -s /opt/oai-enb/etc/enb.fdd.conf /opt/oai-enb/etc/enb.conf; fi
@@ -11,6 +11,7 @@ if [[ -v USE_FDD_RCC ]]; then ln -s /opt/oai-enb/etc/rcc.if4p5.enb.fdd.conf /opt
 if [[ -v USE_FDD_RRU ]]; then ln -s /opt/oai-enb/etc/rru.fdd.conf /opt/oai-enb/etc/enb.conf; fi
 if [[ -v USE_TDD_RRU ]]; then ln -s /opt/oai-enb/etc/rru.tdd.conf /opt/oai-enb/etc/enb.conf; fi
 
+# Only this template will be manipulated
 CONFIG_FILES=`ls /opt/oai-enb/etc/enb.conf`
 
 for c in ${CONFIG_FILES}; do
@@ -21,7 +22,7 @@ for c in ${CONFIG_FILES}; do
     # with the value of the environment variable "VAR"
     EXPRESSIONS=""
     for v in ${VARS}; do
-	NEW_VAR=`echo $v | sed -e "s#@##g"`
+        NEW_VAR=`echo $v | sed -e "s#@##g"`
         if [[ "${!NEW_VAR}x" == "x" ]]; then
             echo "Error: Environment variable '${NEW_VAR}' is not set." \
                 "Config file '$(basename $c)' requires all of $VARS."
@@ -35,10 +36,30 @@ for c in ${CONFIG_FILES}; do
     sed -i "${EXPRESSIONS}" ${c}
 done
 
-# Later-on, how to add command lines options?
-
 # Load the USRP binaries
-# --> later conditional (when doing simulators)
-/usr/lib/uhd/utils/uhd_images_downloader.py
+if [[ -v USE_B2XX ]]; then
+    /usr/lib/uhd/utils/uhd_images_downloader.py -t b2xx
+elif [[ -v USE_X3XX ]]; then
+    /usr/lib/uhd/utils/uhd_images_downloader.py -t x3xx
+elif [[ -v USE_N3XX ]]; then
+    /usr/lib/uhd/utils/uhd_images_downloader.py -t n3xx
+fi
 
-exec "$@"
+echo "=================================="
+echo "== Starting eNB soft modem"
+if [[ -v USE_ADDITIONAL_OPTIONS ]]; then
+    echo "Additional option(s): ${USE_ADDITIONAL_OPTIONS}"
+    new_args=()
+    while [[ $# -gt 0 ]]; do
+        new_args+=("$1")
+        shift
+    done
+    for word in ${USE_ADDITIONAL_OPTIONS}; do
+        new_args+=("$word")
+    done
+    echo "${new_args[@]}"
+    exec "${new_args[@]}"
+else
+    echo "$@"
+    exec "$@"
+fi