From: marchettim <mmarchetti@sandvine.com>
Date: Wed, 26 Sep 2018 18:42:25 +0000 (+0200)
Subject: Merge "Adding Keystone environment variables to NBI"
X-Git-Tag: v5.0.0~95
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=febe521e387c1db91c04d292f56f080d26427027;hp=e193dfd4b1e2f8c530eaf9be6423942a68aec07e;p=osm%2Fdevops.git

Merge "Adding Keystone environment variables to NBI"
---

diff --git a/docker/light-ui/Dockerfile b/docker/light-ui/Dockerfile
index f845f7ac..5cf9aa70 100644
--- 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 e6381005..d64462ab 100644
--- 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 54ef41a0..e1f47b3f 100644
--- 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: