X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fmk%2FMakefile.include;h=ced304aab1fe73f4717d0345c99c7268307f8f22;hb=8cc3a283b46f20b256b2044e505ac03a32fb2113;hp=ceaacaae144aab37699138be2d2dd84c3f842396;hpb=13d76c8224da1ff6ad5181a03af9f4085dae95d4;p=osm%2Fdevops.git

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index ceaacaae..ced304aa 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -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
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -26,11 +28,14 @@ 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_%:
-	$Q$(MKINCLUDE)/get_version.sh -m $* > $@
+	$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,10 +47,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_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) \
                    $(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)