X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fmk%2FMakefile.include;h=e151748381ede62914eac9a61373bf9afa200c58;hb=6248fe6005403005832d6e770e83322d5f679e0f;hp=609c069cdb5d4a3da23ad280bf08a64aad3c2c2a;hpb=9887bb483aca5c1948ecb1939223036316574ed9;p=osm%2Fdevops.git diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index 609c069c..e1517483 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -22,7 +22,7 @@ all: build TAG ?= 6 REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian -RELEASE ?= ReleaseFOUR-daily +RELEASE ?= ReleaseEIGHT-daily REPOSITORY_KEY ?= OSM%20ETSI%20Release%20Key.gpg REPOSITORY ?= testing NO_CACHE ?= --no-cache @@ -34,7 +34,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 lightui NG-UI +DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS)) @@ -49,6 +49,9 @@ $(MKBUILD)/.dep_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_ngui: + $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m NG-UI -p ngui > $@ + $(MKBUILD)/.dep_%: $Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@ @@ -66,10 +69,12 @@ build: $(MKBUILD) $(DEPS_TARGETS) --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 PLA_VERSION==$(shell cat $(MKBUILD)/.dep_PLA) \ --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \ --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \ --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \ - --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_NG-UI) \ + --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_ngui) \ + --build-arg TESTS_VERSION==$(shell cat $(MKBUILD)/.dep_tests) \ $(DOCKER_ARGS) . clean: