commit 1f564ca9e2f623d2e3774efd8c765a8bd02f8151
author Khen Nursimulu <knursimu@ciena.com> Mon Dec 12 13:41:13 2016 -0500
committer Zsolt Haraszti <zharaszt@ciena.com> Mon Dec 12 18:24:35 2016 -0800
tree c1a38d7d9848a84d31772314abb524c12aafa9a5
parent aaac7ee1b70085929f99e55aa655fd7b3161863d

- Fixes the Git merge issue.
- Specify the lxml version (latest version of 2 days ago is broken)

Change-Id: I819bbe378feb5b90d665eed25b4bef9ac7718411

Makefile

diff --git a/Makefile b/Makefile
index 76bee5e..98da42e 100644
--- a/Makefile
+++ b/Makefile
@@ -75,11 +75,11 @@
 	@echo
 
 build: protos docker-base
-	docker build -t cord/voltha -f Dockerfile.voltha .
-	docker build -t cord/chameleon -f Dockerfile.chameleon .
-	docker build -t cord/ofagent -f Dockerfile.ofagent .
-	docker build -t cord/podder -f Dockerfile.podder .
-	docker build -t cord/netconf -f Dockerfile.netconf .
+	docker build -t cord/voltha -f docker/Dockerfile.voltha .
+	docker build -t cord/chameleon -f docker/Dockerfile.chameleon .
+	docker build -t cord/ofagent -f docker/Dockerfile.ofagent .
+	docker build -t cord/podder -f docker/Dockerfile.podder .
+	docker build -t cord/netconf -f docker/Dockerfile.netconf .
 	docker build -t cord/shovel -f docker/Dockerfile.shovel .