projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Metricbeat: removing unused metrics"
[osm/devops.git]
/
docker
/
mk
/
Makefile.include
diff --git
a/docker/mk/Makefile.include
b/docker/mk/Makefile.include
index
2be4d29
..
ced304a
100644
(file)
--- a/
docker/mk/Makefile.include
+++ b/
docker/mk/Makefile.include
@@
-35,7
+35,7
@@
$(MKBUILD)/.dep_%:
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@
build: $(MKBUILD) $(DEPS_TARGETS)
$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m $* > $@
build: $(MKBUILD) $(DEPS_TARGETS)
- $Qdocker build -t o
sm
/$(LOWER_MDG):$(TAG) \
+ $Qdocker build -t o
pensourcemano
/$(LOWER_MDG):$(TAG) \
--build-arg RELEASE=$(RELEASE) \
--build-arg REPOSITORY=$(REPOSITORY) \
--build-arg REPOSITORY_KEY=$(REPOSITORY_KEY) \
--build-arg RELEASE=$(RELEASE) \
--build-arg REPOSITORY=$(REPOSITORY) \
--build-arg REPOSITORY_KEY=$(REPOSITORY_KEY) \
@@
-57,7
+57,7
@@
clean:
rm -f $(MKBUILD)/.dep*
tag:
rm -f $(MKBUILD)/.dep*
tag:
- docker tag o
sm
/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
+ docker tag o
pensourcemano
/$(CONTAINER_NAME):$(INPUT_TAG) opensourcemano/$(LOWER_MDG):$(TAG)
push: tag
docker push opensourcemano/$(LOWER_MDG):$(TAG)
push: tag
docker push opensourcemano/$(LOWER_MDG):$(TAG)