X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fmk%2FMakefile.include;h=f8e34c53516ce59698f2c9b048882573d9dffd59;hb=69b532b05f993931ce73b997de85123a7da09d35;hp=2be4d295681593eb9b71ca4405fe1094d370da0b;hpb=9e7ed04f285ad067bbaf402ed2c9a17c063b64f3;p=osm%2Fdevops.git

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index 2be4d295..f8e34c53 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -1,13 +1,28 @@
+#
+#   Copyright 2020 ETSI
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
 TOPDIR=$(shell readlink -f .|sed -e 's/\/docker\/.*//')
 MKINCLUDE=$(TOPDIR)/docker/mk
 MKBUILD=$(TOPDIR)/docker/build
 
 all: build
 
-TAG ?= latest
+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
@@ -19,7 +34,8 @@ 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 ngui PLA tests
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC ngui PLA tests
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -31,11 +47,17 @@ $(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_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 $* > $@
 
 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) \
@@ -48,16 +70,19 @@ 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 date +%s) \
+                   --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \
+                   --build-arg NGUI_VERSION==$(shell cat $(MKBUILD)/.dep_ngui) \
+                   --build-arg TESTS_VERSION==$(shell cat $(MKBUILD)/.dep_tests) \
                    $(DOCKER_ARGS) .
 
 clean:
 	rm -f $(MKBUILD)/.dep*
 
 tag:
-	docker tag osm/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
+	docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
 
 push: tag
 	docker push opensourcemano/$(LOWER_MDG):$(TAG)