VOL-2131: Use base docker image
Also remove unused ponsim dockerfiles as
they are in their own repo now.
Change-Id: Ic9c1723ffd01afaefc9783374d467df061bbe737
diff --git a/python/docker/Dockerfile.adapter_ponsim_olt b/python/docker/Dockerfile.adapter_ponsim_olt
deleted file mode 100644
index 75f135c..0000000
--- a/python/docker/Dockerfile.adapter_ponsim_olt
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-FROM ubuntu:16.04
-
-# Update to have latest images
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- ca-certificates=20170717~16.04.2 \
- python=2.7.12-1~16.04 \
- openssl=1.0.2g-1ubuntu4.15 \
- iproute2=4.3.0-1ubuntu3.16.04.5 \
- libpcap-dev=1.7.4-2 \
- wget=1.17.1-1ubuntu1.5 \
- build-essential=12.1ubuntu2 \
- git=1:2.7.4-0ubuntu1.6 \
- binutils=2.26.1-1ubuntu1~16.04.8 \
- python-dev=2.7.12-1~16.04 \
- libffi-dev=3.2.1-4 \
- libssl-dev=1.0.2g-1ubuntu4.15 \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install current version of pip rather than outdated pip from apt
-RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
-RUN python /tmp/get-pip.py
-
-# Install adapter requirements.
-COPY requirements.txt /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
-
-ARG LOCAL_PYVOLTHA
-ARG LOCAL_PROTOS
-COPY local_imports/ /local_imports/
-RUN if [ -n "$LOCAL_PYVOLTHA" ] ; then \
- PYVOLTHA_PATH=$(ls /local_imports/pyvoltha/dist/) ; \
- printf "/local_imports/pyvoltha/dist/%s\npyvoltha" "$PYVOLTHA_PATH" > pyvoltha-install.txt ; \
- pip install -r pyvoltha-install.txt ; \
-fi
-
-RUN if [ -n "$LOCAL_PROTOS" ] ; then \
- PROTOS_PATH=$(ls /local_imports/voltha-protos/dist/) ; \
- printf "/local_imports/voltha-protos/dist/%s\nvoltha-protos" "$PROTOS_PATH" > protos-install.txt ; \
- pip install -r protos-install.txt ; \
-fi
-
-# Bundle app source
-RUN mkdir /voltha && touch /voltha/__init__.py
-ENV PYTHONPATH=/voltha
-COPY adapters/ponsim_olt /voltha/python/adapters/ponsim_olt
-RUN touch /voltha/python/__init__.py
-RUN touch /voltha/python/adapters/__init__.py
-
-# Exposing process and default entry point
-CMD ["python", "/voltha/python/adapters/ponsim_olt/main.py"]
-
-# Label image
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-
-LABEL org.label-schema.schema-version=1.0 \
- org.label-schema.name=voltha-adapter-ponsim-olt \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
diff --git a/python/docker/Dockerfile.adapter_ponsim_onu b/python/docker/Dockerfile.adapter_ponsim_onu
deleted file mode 100644
index 58689cc..0000000
--- a/python/docker/Dockerfile.adapter_ponsim_onu
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-FROM ubuntu:16.04
-
-# Update to have latest images
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- ca-certificates=20170717~16.04.2 \
- python=2.7.12-1~16.04 \
- openssl=1.0.2g-1ubuntu4.15 \
- iproute2=4.3.0-1ubuntu3.16.04.5 \
- libpcap-dev=1.7.4-2 \
- wget=1.17.1-1ubuntu1.5 \
- build-essential=12.1ubuntu2 \
- git=1:2.7.4-0ubuntu1.6 \
- binutils=2.26.1-1ubuntu1~16.04.8 \
- python-dev=2.7.12-1~16.04 \
- libffi-dev=3.2.1-4 \
- libssl-dev=1.0.2g-1ubuntu4.15 \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install current version of pip rather than outdated pip from apt
-RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
-RUN python /tmp/get-pip.py
-
-# Install adapter requirements.
-COPY requirements.txt /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
-
-ARG LOCAL_PYVOLTHA
-ARG LOCAL_PROTOS
-COPY local_imports/ /local_imports/
-RUN if [ -n "$LOCAL_PYVOLTHA" ] ; then \
- PYVOLTHA_PATH=$(ls /local_imports/pyvoltha/dist/) ; \
- printf "/local_imports/pyvoltha/dist/%s\npyvoltha" "$PYVOLTHA_PATH" > pyvoltha-install.txt ; \
- pip install -r pyvoltha-install.txt ; \
-fi
-
-RUN if [ -n "$LOCAL_PROTOS" ] ; then \
- PROTOS_PATH=$(ls /local_imports/voltha-protos/dist/) ; \
- printf "/local_imports/voltha-protos/dist/%s\nvoltha-protos" "$PROTOS_PATH" > protos-install.txt ; \
- pip install -r protos-install.txt ; \
- fi
-
-# Bundle app source
-RUN mkdir /voltha && touch /voltha/__init__.py
-ENV PYTHONPATH=/voltha
-COPY adapters/ponsim_onu /voltha/python/adapters/ponsim_onu
-RUN touch /voltha/python/__init__.py
-RUN touch /voltha/python/adapters/__init__.py
-
-# Exposing process and default entry point
-CMD ["python", "/voltha/python/adapters/ponsim_onu/main.py"]
-
-# Label image
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-
-LABEL org.label-schema.schema-version=1.0 \
- org.label-schema.name=voltha-adapter-ponsim-onu \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
diff --git a/python/docker/Dockerfile.cli b/python/docker/Dockerfile.cli
index eec4185..b00420a 100644
--- a/python/docker/Dockerfile.cli
+++ b/python/docker/Dockerfile.cli
@@ -11,30 +11,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:16.04
+FROM voltha/voltha-python-base:1.0.0
# Update to have latest images
RUN apt-get update && \
apt-get install -y --no-install-recommends \
- ca-certificates=20170717~16.04.2 \
- python=2.7.12-1~16.04 \
- openssl=1.0.2g-1ubuntu4.15 \
- iproute2=4.3.0-1ubuntu3.16.04.5 \
- libpcap-dev=1.7.4-2 \
- wget=1.17.1-1ubuntu1.5 \
- build-essential=12.1ubuntu2 \
- git=1:2.7.4-0ubuntu1.6 \
- binutils=2.26.1-1ubuntu1~16.04.8 \
- python-dev=2.7.12-1~16.04 \
- libffi-dev=3.2.1-4 \
- libssl-dev=1.0.2g-1ubuntu4.15 \
openssh-server=1:7.2p2-4ubuntu2.8 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
-# Install current version of pip rather than outdated pip from apt
-RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
-RUN python /tmp/get-pip.py
-
# Install adapter requirements.
COPY requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt
diff --git a/python/docker/Dockerfile.ofagent b/python/docker/Dockerfile.ofagent
index 52ebaaa..73e8789 100644
--- a/python/docker/Dockerfile.ofagent
+++ b/python/docker/Dockerfile.ofagent
@@ -11,28 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:16.04
-
-# Update to have latest images
-RUN apt-get update && \
- apt-get install -y --no-install-recommends \
- ca-certificates=20170717~16.04.2 \
- python=2.7.12-1~16.04 \
- openssl=1.0.2g-1ubuntu4.15 \
- iproute2=4.3.0-1ubuntu3.16.04.5 \
- libpcap-dev=1.7.4-2 \
- wget=1.17.1-1ubuntu1.5 \
- build-essential=12.1ubuntu2 \
- git=1:2.7.4-0ubuntu1.6 \
- binutils=2.26.1-1ubuntu1~16.04.8 \
- python-dev=2.7.12-1~16.04 \
- libffi-dev=3.2.1-4 \
- libssl-dev=1.0.2g-1ubuntu4.15 \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install current version of pip rather than outdated pip from apt
-RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
-RUN python /tmp/get-pip.py
+FROM voltha/voltha-python-base:1.0.0
# Install adapter requirements.
COPY requirements.txt /tmp/requirements.txt
diff --git a/python/requirements.txt b/python/requirements.txt
index b82f310..9a0ca56 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,63 +1,2 @@
-argparse==1.2.1
-arrow==0.10.0
-bitstring==3.1.5
-cmd2==0.7.0
-colorama==0.3.9
-confluent-kafka==0.11.5
-cython==0.24.1
-decorator==4.1.2
-docker-py==1.10.6
-fluent-logger==0.6.0
-grpc==0.3.post19
-grpcio==1.16.0
-grpcio-tools==1.16.0
-hash_ring==1.3.1
-hexdump==3.3
-jinja2==2.8
-jsonpatch==1.16
-kafka_python==1.3.5
-kafkaloghandler==0.9.0
-klein==17.10.0
-kubernetes==5.0.0
-netaddr==0.7.19
-networkx==2.0
-netifaces==0.10.6
-pcapy==0.11.1
-pep8==1.7.1
-pep8-naming>=0.3.3
-protobuf==3.6.1
-protobuf-to-dict==0.1.0
-pyflakes==2.1.0
-pylint==1.9.4
-pyOpenSSL==17.3.0
-PyYAML==3.12
-requests==2.18.4
-scapy==2.3.3
-service-identity==17.0.0
-simplejson==3.12.0
-jsonschema==2.6.0
-six==1.12.0
-structlog==17.2.0
-termcolor==1.1.0
-transitions==0.6.4
-treq==17.8.0
-Twisted==18.7.0
-txaioetcd==0.3.0
-urllib3==1.22
-pyang==1.7.3
-lxml==3.6.4
-nosexcover==1.0.11
-zmq==0.0.0
-pyzmq==16.0.3
-txZMQ==0.8.0
-ncclient==0.5.3
-xmltodict==0.11.0
-dicttoxml==1.7.4
-etcd3==0.7.0
-pyparsing==2.2.0
-packaging==17.1
-pexpect==4.6.0
-python-consul==0.6.2
-afkak==3.0.0.dev20181106
voltha-protos==1.0.0
pyvoltha==0.2.2