Merge "Adding Keystone environment variables to NBI"

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index f845f7a..5cf9aa7 100644 (file)
--- a/docker/light-ui/Dockerfile
+++ b/docker/light-ui/Dockerfile
@@ -4,7 +4,9 @@ WORKDIR /usr/src/app
 
 RUN apt-get update && apt-get install -y npm git python-pip nginx supervisor
 RUN npm install -g bower
-RUN git clone https://osm.etsi.org/gerrit/osm/LW-UI /usr/src/app
+
+ARG LWUI_VERSION=
+RUN git clone https://osm.etsi.org/gerrit/osm/LW-UI /usr/src/app && echo LWUI_VERSION
 
 RUN ln -s /usr/bin/nodejs /usr/bin/node
 RUN bower install --allow-root

diff --git a/docker/light-ui/Makefile b/docker/light-ui/Makefile
index e638100..d64462a 100644 (file)
--- a/docker/light-ui/Makefile
+++ b/docker/light-ui/Makefile
@@ -1,6 +1,3 @@
 include ../mk/Makefile.include
 
-# Currently LW-UI needs no-cache (binary version packages not yet available)
-DOCKER_ARGS += $(NO_CACHE)
-
 MDG=$(shell basename $(CURDIR))

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index 54ef41a..e1f47b3 100644 (file)
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -44,6 +44,7 @@ build: $(MKBUILD) $(DEPS_TARGETS)
                    --build-arg NBI_VERSION==$(shell cat $(MKBUILD)/.dep_NBI) \
                    --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_POL) \
                    --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \
+                   --build-arg LWUI_VERSION==$(shell date +%s) \
                    $(DOCKER_ARGS) .
 
 clean: