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/docker/Dockerfile.ofagent b/python/docker/Dockerfile.ofagent
index 48b4728..dee28ed 100644
--- a/python/docker/Dockerfile.ofagent
+++ b/python/docker/Dockerfile.ofagent
@@ -15,6 +15,7 @@
ARG REGISTRY=
ARG REPOSITORY=
+FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
MAINTAINER Voltha Community <info@opennetworking.org>
@@ -33,11 +34,16 @@
rm -f *.deb
# Bundle app source
-RUN mkdir /ofagent && touch /ofagent/__init__.py
+RUN mkdir -p /ofagent/ofagent/protos/third_party/google/api && \
+ touch /ofagent/__init__.py \
+ /ofagent/ofagent/protos/third_party/google/__init__.py \
+ /ofagent/ofagent/protos/third_party/google/api/__init__.py
ENV PYTHONPATH=/ofagent
COPY common /ofagent/common
COPY ofagent /ofagent/ofagent
COPY pki /ofagent/pki
+COPY --from=protos /protos/voltha /ofagent/ofagent/protos
+COPY --from=protos /protos/google/api /ofagent/ofagent/protos/third_party/google/api
ENTRYPOINT ["/usr/bin/dumb-init", "--"]