X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fmk%2FMakefile.include;h=ced304aab1fe73f4717d0345c99c7268307f8f22;hb=0d45bc887eb1d7d60d5fa79643950ef75a189602;hp=fb576e7b160cd9f6e5e6e273745d341449edefa0;hpb=9cf4156e6cf87f4eaa96180347badcbbb4a80644;p=osm%2Fdevops.git diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index fb576e7b..ced304aa 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -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 +DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS)) @@ -35,7 +35,7 @@ $(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) \ @@ -49,6 +49,7 @@ build: $(MKBUILD) $(DEPS_TARGETS) --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) . @@ -56,4 +57,7 @@ clean: rm -f $(MKBUILD)/.dep* tag: - docker tag osm/$(CONTAINER_NAME) osm/$(LOWER_MDG):$(TAG) + docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG) + +push: tag + docker push opensourcemano/$(LOWER_MDG):$(TAG)