X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=69e1d65bd31da336d9116c048c2ccd927817acfb;hb=6fc8b3930b871cf78e56df98ef15df320efde4af;hp=6288cf85eb87c3409463707c002985811dffac98;hpb=655a917b161a458d3c4446e4e5e4b208a04f3ade;p=bottlenecks.git diff --git a/docker/Dockerfile b/docker/Dockerfile index 6288cf85..69e1d65b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,8 +36,9 @@ RUN apt-get update && apt-get install -y \ python \ python-dev \ python-pip \ + vim \ python-setuptools && \ - easy_install -U setuptools + easy_install -U setuptools==30.0.0 RUN apt-get -y autoremove && \ apt-get clean @@ -45,8 +46,9 @@ RUN apt-get -y autoremove && \ RUN mkdir -p ${REPOS_DIR} RUN git config --global http.sslVerify false -RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR} +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.txt +RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements/requirements.txt +RUN pip install -U /home/opnfv/bottlenecks