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=-c;p=osm%2Fdevops.git

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

febe521e387c1db91c04d292f56f080d26427027
diff --combined docker/mk/Makefile.include
index 0c44636e,54ef41a0..e1f47b3f
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@@ -17,7 -17,7 +17,7 @@@ LOWER_MDG = $(shell echo $(MDG) | tr '[
  CMD_DOCKER_ARGS ?= -q
  DOCKER_ARGS     = $(CMD_DOCKER_ARGS)
  
- DEPS := MON IM LCM RO common osmclient devops NBI POL
+ DEPS := MON IM LCM RO common osmclient devops NBI POL Keystone
  
  DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
  
@@@ -44,7 -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: