Reverting recent changes that broke packet in plumbing

Change-Id: I12bc2f46aa9fc4266b5caae26cc4778fe17e9782
diff --git a/Makefile b/Makefile
index 3ece56c..055094b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 
 VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
 
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos
 
 default: build
 
@@ -100,7 +100,7 @@
 	docker build -t cord/shovel -f docker/Dockerfile.shovel .
 
 onos:
-	docker build -t cord/onos -f docker/Dockerfile.onos .
+	docker build -t cord/onos -f docker/Dockerfile.onos docker
 
 protos:
 	make -C voltha/protos