diff options
| author |   Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> | 2018-06-13 17:23:12 +0800 |
|---|---|---|
| committer | Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com> | 2018-06-15 15:57:05 +0000 |
| commit | 6cc88168430565cea5eb7dd278d849947ed1d20d (patch) | |
| tree | 8c168846c4ef73414f14fbfd38913c1ff720aa11 /docker | |
| parent | ca52dc03db2d8530ed149a98ecc1213f9c45ebba (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>
(cherry picked from commit 0ea5233caabae215afb0769194a87f32a430fa2d)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 69e1d65b..8f124cb2 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} |