Merge "Adds OSMUI_SQL_DATABASE_URI env var generation to installer"
diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index 1e54567..29cbb74 100644
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -1,6 +1,6 @@
FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common
+RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor curl software-properties-common libmysqlclient-dev mysql-client
RUN npm install -g bower
RUN ln -s /usr/bin/nodejs /usr/bin/node
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
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}"
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"
}