Merge "Adds healthcheck to POL"

[osm/devops.git] / docker / mk / Makefile.include

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index 2be4d29..e19c753 100644 (file)
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -4,7 +4,7 @@ MKBUILD=$(TOPDIR)/docker/build
 
 all: build
 
-TAG ?= latest
+TAG ?= 6
 
 REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian
 RELEASE         ?= ReleaseFOUR-daily
@@ -19,7 +19,7 @@ CONTAINER_NAME ?= $(LOWER_MDG)
 CMD_DOCKER_ARGS ?= -q
 DOCKER_ARGS     = $(CMD_DOCKER_ARGS)
 
-DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -31,11 +31,14 @@ $(MKBUILD):
 $(MKBUILD)/.dep_policy-module:
        $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m POL -p policy-module > $@
 
+$(MKBUILD)/.dep_lightui:
+       $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m LW-UI -p lightui > $@
+
 $(MKBUILD)/.dep_%:
        $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@
 
 build: $(MKBUILD) $(DEPS_TARGETS)
-       $Qdocker build -t osm/$(LOWER_MDG):$(TAG) \
+       $Qdocker build -t opensourcemano/$(LOWER_MDG):$(TAG) \
                    --build-arg RELEASE=$(RELEASE) \
                    --build-arg REPOSITORY=$(REPOSITORY) \
                    --build-arg REPOSITORY_KEY=$(REPOSITORY_KEY) \
@@ -50,14 +53,14 @@ build: $(MKBUILD) $(DEPS_TARGETS)
                    --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_policy-module) \
                    --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \
                    --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \
-                   --build-arg LWUI_VERSION==$(shell date +%s) \
+                   --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \
                    $(DOCKER_ARGS) .
 
 clean:
        rm -f $(MKBUILD)/.dep*
 
 tag:
-       docker tag osm/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
+       docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
 
 push: tag
        docker push opensourcemano/$(LOWER_MDG):$(TAG)