commit 4088a9bdec94c554fe23e35ac9df482c91241de5
author Benjamin Diaz <bdiaz@whitestack.com> Tue May 21 15:11:49 2019 -0300
committer Benjamin Diaz <bdiaz@whitestack.com> Wed May 22 13:53:26 2019 -0300
tree 283ffd961a38afe51a7bae5a902ee6185b0c9762
parent 8e003844f709b266197caf1540f03b007882f05c

Adds OSMUI_SQL_DATABASE_URI env var generation to installer

Adds install of mysql deps in LWUI Dockerfile.
Adds use of entrypoint script in LWUI Dockerfile

Change-Id: Iab709bd534291083d4890dd33e9f3c490d11cea1
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>

installers/docker/docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index f608262..d8866e5 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -174,5 +174,7 @@
       OSM_SERVER: nbi
     #depends_on:
     #  - nbi
+    env_file:
+      - ./lwui.env
     ports:
       - "${OSM_UI_PORTS:-80:80}"

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index c1380d5..3276b14 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -834,6 +834,11 @@
         echo "OSMPOL_SQL_DATABASE_URI=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/pol" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/pol.env
     fi
 
+    # LW-UI
+    if [ ! -f $OSM_DOCKER_WORK_DIR/lwui.env ]; then
+        echo "OSMUI_SQL_DATABASE_URI=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/lwui" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lwui.env
+    fi
+
     echo "Finished generation of docker env files"
 }