commit 407392144c327a41ce65d251c8bcf6be2d8156aa
author schowdhury <schowdhury@radisys.com> Mon Jun 12 07:40:31 2017 -0700
committer khenaidoo Nursimulu <knursimu@ciena.com> Tue Jun 13 07:39:35 2017 -0700
tree d5e4eee5baf17c6e0cc684d75620c31fe46e6126
parent 4cad268ecdb5c34b1e6872c06ef7c4b039831993

Build voltha/consul Container Image with its own file system, not mounted volume from the Host.

  -- Added --data-dir Option in Consul Launch Command
  -- Added --config-dir Option Consul Launch Command
  -- Fixed the Launch issue and removed --data-dir & --config-dir Option from launch command.

Build voltha/registrator Comtainer Image with its own file system.

  -- Fixed nginx volume path (typo)

Change-Id: I4640e81feaac683b057bdfa5cda5e16579f58a37

Makefile

diff --git a/Makefile b/Makefile
index d7cce7c..db15322 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 
 VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
 
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator
 
 # This should to be the first and default target in this Makefile
 help:
@@ -55,6 +55,8 @@
 	@echo "portainer    : Build the portainer docker container"
 	@echo "grafana      : Build the grafana docker container"
 	@echo "nginx        : Build the nginx docker container"
+	@echo "consul       : Build the consul docker container"
+	@echo "registrator  : Build the registrator docker container"
 	@echo
 
 ## New directories can be added here
@@ -91,7 +93,7 @@
 
 build: protos containers
 
-containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx
+containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator
 
 docker-base:
 	docker build -t cord/voltha-base -f docker/Dockerfile.base .
@@ -135,6 +137,12 @@
 nginx:
 	docker build -t voltha/nginx -f docker/Dockerfile.nginx .
 
+consul:
+	docker build -t voltha/consul -f docker/Dockerfile.consul .
+
+registrator:
+	docker build -t voltha/registrator -f docker/Dockerfile.registrator .
+
 grafana:
 	docker build -t voltha/grafana -f docker/Dockerfile.grafana .