X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fmk%2FMakefile.include;h=a6df090fbdee2bddd6d47e32cb59090f5296ee41;hb=59c9465cac22604312947eebde176fe784b8679d;hp=ced304aab1fe73f4717d0345c99c7268307f8f22;hpb=df1296d5342ce2d96b2a21c4f4ac15ac048a18e5;p=osm%2Fdevops.git diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index ced304aa..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 @@ -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,6 +31,9 @@ $(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 $* > $@ @@ -50,7 +53,7 @@ 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: