Modify ofagent docker build to use protos image
This mimics the behavior of other python based containers
and allows ofagent to start from just a "make build" in
voltha-go/python
Also add the cli image build to the default list
Also add a combined system-test docker-compose that brings up
everything in one shot
Change-Id: I1eeb3fe58eb2841176c999a2729d7331278b1207
diff --git a/python/Makefile b/python/Makefile
index 737ae89..0276a91 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -111,7 +111,7 @@
@echo "adapter_ponsim_olt : Build the ponsim olt adapter docker container"
@echo "adapter_ponsim_onu : Build the ponsim olt adapter docker container"
@echo "adapter_openolt : Build the openolt adapter docker container"
- @echo "ofagent : Build the openolt adapter docker container"
+ @echo "ofagent : Build the openflow agent docker container"
@echo "tag : Tag a set of images"
@echo "push : Push the docker images to an external repository"
@echo "pull : Pull the docker images from a repository"
@@ -146,7 +146,7 @@
build: protoc protos containers
-containers: base adapter_ponsim_olt adapter_ponsim_onu adapter_openolt ofagent
+containers: base adapter_ponsim_olt adapter_ponsim_onu adapter_openolt ofagent cli
base:
docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}voltha-base:${TAG} -f docker/Dockerfile.base .