projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring Prometheus Charm to use Operator Framework
[osm/devops.git]
/
docker
/
mk
/
Makefile.include
diff --git
a/docker/mk/Makefile.include
b/docker/mk/Makefile.include
index
f8e34c5
..
4105295
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
TAG ?= 6
REPOSITORY_BASE ?= http://osm-download.etsi.org/repository/osm/debian
-RELEASE ?= Release
EIGHT
-daily
+RELEASE ?= Release
NINE
-daily
REPOSITORY_KEY ?= OSM%20ETSI%20Release%20Key.gpg
REPOSITORY ?= testing
NO_CACHE ?= --no-cache
REPOSITORY_KEY ?= OSM%20ETSI%20Release%20Key.gpg
REPOSITORY ?= testing
NO_CACHE ?= --no-cache
+DOCKER_REGISTRY ?= ""
LOWER_MDG = $(shell echo $(MDG) | tr '[:upper:]' '[:lower:]')
LOWER_MDG = $(shell echo $(MDG) | tr '[:upper:]' '[:lower:]')
@@
-34,8
+35,7
@@
CONTAINER_NAME ?= $(LOWER_MDG)
CMD_DOCKER_ARGS ?= -q
DOCKER_ARGS = $(CMD_DOCKER_ARGS)
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 tests
-DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC ngui PLA tests
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests
DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
@@
-47,8
+47,8
@@
$(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_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_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_ngui:
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m NG-UI -p ngui > $@
@@
-82,7
+82,7
@@
clean:
rm -f $(MKBUILD)/.dep*
tag:
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
push: tag
- docker push opensourcemano/$(LOWER_MDG):$(TAG)
+ docker push
$(DOCKER_REGISTRY)
opensourcemano/$(LOWER_MDG):$(TAG)