VOL-1449 Update requirements to match pyvoltha

Also ignore and cleanup any local pyvoltha copies.
Also no longer need voltha-protos image

Change-Id: Id42676e38f38f3014bf547fd7820abf7eb2d5ea5
diff --git a/python/docker/Dockerfile.openolt_adapter b/python/docker/Dockerfile.openolt_adapter
index 745cfe7..81f2690 100644
--- a/python/docker/Dockerfile.openolt_adapter
+++ b/python/docker/Dockerfile.openolt_adapter
@@ -15,7 +15,7 @@
 ARG REGISTRY=
 ARG REPOSITORY=
 
-FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
+#FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
 # FROM ${REGISTRY}${REPOSITORY}voltha-openolt-protos:${TAG} as openolt_protos
 FROM ${REGISTRY}${REPOSITORY}voltha-openolt-adapter-base:${TAG}
 
@@ -28,4 +28,4 @@
 RUN touch /voltha/adapters/__init__.py
 
 # Exposing process and default entry point
-# CMD ["python", "/voltha/python/adapters/openolt/main.py"]
+CMD ["python", "/voltha/adapters/openolt/main.py"]