Code Review
/
bottlenecks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix the version of more-itertools to be 5.0.0
[bottlenecks.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
6288cf8
..
ef63e3b
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-7,8
+7,8
@@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-FROM ubuntu:1
4
.04
-MAINTAINER
MatthewLi <matthew.lijun
@huawei.com>
+FROM ubuntu:1
6
.04
+MAINTAINER
Yang (Gabriel) Yu <gabriel.yuyang
@huawei.com>
LABEL image=opnfv/bottlenecks
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
# 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 \
#new test suite required packages can be added here
RUN apt-get update && apt-get install -y \
@@
-32,21
+31,25
@@
RUN apt-get update && apt-get install -y \
curl \
wget \
git \
curl \
wget \
git \
- sshpass \
python \
python \
- python-dev \
python-pip \
python-pip \
+ vim \
+ iputils-ping \
+ sshpass \
+ sudo \
python-setuptools && \
python-setuptools && \
- easy_install -U setuptools
-
-RUN apt-get -y autoremove && \
+ apt-get -y autoremove && \
apt-get clean
apt-get clean
+RUN easy_install -U setuptools==30.0.0
+
RUN mkdir -p ${REPOS_DIR}
RUN git config --global http.sslVerify false
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 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 bash ${BOTTLENECKS_REPO_DIR}/utils/k8s_setup/kubectl_install.sh
+
+RUN pip install -r ${BOTTLENECKS_REPO_DIR}/requirements/requirements.txt
+RUN pip install -U ${BOTTLENECKS_REPO_DIR}