Correcting Syntax for Docker

[osm/devops.git] / docker / mk / Makefile.include

diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index 6d5f261..995cbdf 100644 (file)
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -22,10 +22,11 @@ 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
+DOCKER_REGISTRY ?= ""
 
 LOWER_MDG = $(shell echo $(MDG) | tr '[:upper:]' '[:lower:]')
 
@@ -34,7 +35,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 ngui PLA
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -74,13 +75,14 @@ build: $(MKBUILD) $(DEPS_TARGETS)
                    --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_ngui) \
+                   --build-arg TESTS_VERSION==$(shell cat $(MKBUILD)/.dep_tests) \
                    $(DOCKER_ARGS) .
 
 clean:
        rm -f $(MKBUILD)/.dep*
 
 tag:
-       docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
+       docker tag opensourcemano/$(CONTAINER_NAME):$(INPUT_TAG) $(DOCKER_REGISTRY)opensourcemano/$(LOWER_MDG):$(TAG)
 
 push: tag
-       docker push opensourcemano/$(LOWER_MDG):$(TAG)
+       docker push $(DOCKER_REGISTRY)opensourcemano/$(LOWER_MDG):$(TAG)