X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fmk%2FMakefile.include;h=a6df090fbdee2bddd6d47e32cb59090f5296ee41;hb=59c9465cac22604312947eebde176fe784b8679d;hp=e1f47b3f2fad3d55d37a8d60c97011439d9d87b2;hpb=7bfdced8ddcbdfa07a27bd3b07c1b103320587c1;p=osm%2Fdevops.git

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index e1f47b3f..a6df090f 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -4,7 +4,7 @@ MKBUILD=$(TOPDIR)/docker/build
 
 all: build
 
-TAG ?= latest
+TAG ?= 5
 
 REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian
 RELEASE         ?= ReleaseFOUR-daily
@@ -14,10 +14,12 @@ NO_CACHE        ?= --no-cache
 
 LOWER_MDG = $(shell echo $(MDG) | tr '[:upper:]' '[:lower:]')
 
+CONTAINER_NAME ?= $(LOWER_MDG)
+
 CMD_DOCKER_ARGS ?= -q
 DOCKER_ARGS     = $(CMD_DOCKER_ARGS)
 
-DEPS := MON IM LCM RO common osmclient devops NBI POL Keystone
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -26,11 +28,17 @@ Q=@
 $(MKBUILD):
 	$Qmkdir -p $(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) \
@@ -42,13 +50,17 @@ build: $(MKBUILD) $(DEPS_TARGETS)
                    --build-arg COMMON_VERSION==$(shell cat $(MKBUILD)/.dep_common) \
                    --build-arg OSMCLIENT_VERSION==$(shell cat $(MKBUILD)/.dep_osmclient) \
                    --build-arg NBI_VERSION==$(shell cat $(MKBUILD)/.dep_NBI) \
-                   --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_POL) \
+                   --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_policy-module) \
                    --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \
-                   --build-arg LWUI_VERSION==$(shell date +%s) \
+                   --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \
+                   --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \
                    $(DOCKER_ARGS) .
 
 clean:
 	rm -f $(MKBUILD)/.dep*
 
 tag:
-	docker tag osm/$(LOWER_MDG) osm/$(LOWER_MDG):$(TAG)
+	docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
+
+push: tag
+	docker push opensourcemano/$(LOWER_MDG):$(TAG)