summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-06-13 17:23:12 +0800
committerYang (Gabriel) Yu <Gabriel.yuyang@huawei.com>2018-06-14 11:52:32 +0800
commit0ea5233caabae215afb0769194a87f32a430fa2d (patch)
tree8c168846c4ef73414f14fbfd38913c1ff720aa11
parentf6ca90e950a3b007b118cad702616267fab91916 (diff)
Update Dockerfile
1. Openstack command lines keep poping up warnings which cause reading comand results wrongly. 2. Update the ubuntu version and packages to remove redundance which is a historical debt. Change-Id: I3cdb7a9ec3f0bc41ecfe5b8bf9d44878485de40f Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
-rw-r--r--docker/Dockerfile20
-rw-r--r--requirements/requirements.txt70
2 files changed, 13 insertions, 77 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 69e1d65..8f124cb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,8 +7,8 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-FROM ubuntu:14.04
-MAINTAINER MatthewLi <matthew.lijun@huawei.com>
+FROM ubuntu:16.04
+MAINTAINER Yang (Gabriel) Yu <gabriel.yuyang@huawei.com>
LABEL image=opnfv/bottlenecks
@@ -21,7 +21,6 @@ ARG BRANCH=master
# Bottlenecks repo
ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks
ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
-ENV creds ${BOTTLENECKS_REPO_DIR}/config/openstack.creds
#new test suite required packages can be added here
RUN apt-get update && apt-get install -y \
@@ -32,23 +31,22 @@ RUN apt-get update && apt-get install -y \
curl \
wget \
git \
- sshpass \
python \
- python-dev \
python-pip \
vim \
+ iputils-ping \
+ sshpass \
python-setuptools && \
- easy_install -U setuptools==30.0.0
-
-RUN apt-get -y autoremove && \
+ apt-get -y autoremove && \
apt-get clean
+RUN easy_install -U setuptools==30.0.0
+
RUN mkdir -p ${REPOS_DIR}
RUN git config --global http.sslVerify false
RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
-RUN easy_install pytz
-RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements/requirements.txt
-RUN pip install -U /home/opnfv/bottlenecks
+RUN pip install -r ${BOTTLENECKS_REPO_DIR}/requirements/requirements.txt
+RUN pip install -U ${BOTTLENECKS_REPO_DIR}
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 113be33..dacffce 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -8,75 +8,13 @@
##############################################################################
appdirs==1.4.0
-Babel==2.2.0
-backport-ipaddress==0.1
-cliff==2.0.0
-cmd2==0.6.8
-coverage==4.1b2
-debtcollector==1.3.0
-ecdsa==0.13
-extras==0.0.3
-fixtures==1.4.0
+pyopenssl==17.5.0
+python-openstackclient==3.11.0
+python-heatclient==1.11.0
+python-neutronclient==6.1.1
flake8==2.5.4
-funcsigs==0.4
-functools32==3.2.3.post2
-futures==3.0.5
-iso8601==0.1.11
Jinja2==2.8
-jsonpatch==1.13
-jsonpointer==1.10
-jsonschema==2.5.1
-keystoneauth1==2.3.0
-linecache2==1.0.0
-lxml==3.5.0
-MarkupSafe==0.23
-mccabe==0.4.0
-mock==1.3.0
-monotonic==1.0
-msgpack-python==0.4.7
-netaddr==0.7.18
-netifaces==0.10.4
nose==1.3.7
-openstacksdk==0.8.1
-os-client-config==1.16.0
-oslo.config==3.9.0
-oslo.i18n==3.4.0
-oslo.serialization==2.4.0
-oslo.utils==3.7.0
-paramiko==1.16.0
-pbr==1.8.1
-pep8==1.7.0
-positional==1.0.1
-prettytable==0.7.2
-pycrypto==2.6.1
-pyflakes==1.0.0
-pyparsing==2.1.0
-pyrsistent==0.11.12
-python-cinderclient==1.6.0
-python-glanceclient==2.0.0
-python-heatclient==1.0.0
-python-keystoneclient==2.3.1
-python-mimeparse==1.5.1
-python-neutronclient==4.1.1
-python-novaclient==3.3.0
-python-openstackclient==2.2.0
-python-subunit==1.2.0
-python-swiftclient==3.0.0
-pytz==2015.7
-PyYAML==3.11
-requests==2.9.1
-requestsexceptions==1.1.3
-scp==0.10.2
-simplejson==3.8.2
-six==1.10.0
-stevedore==1.12.0
-testrepository==0.0.20
-testtools==2.0.0
-traceback2==1.4.0
-unicodecsv==0.14.1
-unittest2==1.1.0
-warlock==1.2.0
-wrapt==1.10.6
pyroute2==0.4.10
elasticsearch==5.0.1
docker==2.0.2