diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b48a550bf..b1eb50592 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,24 +7,24 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -FROM ubuntu:14.04 +FROM ubuntu:16.04 LABEL image=opnfv/yardstick ARG BRANCH=master # GIT repo directory -ENV REPOS_DIR /home/opnfv/repos -ENV IMAGE_DIR /home/opnfv/images/ +ENV REPOS_DIR="/home/opnfv/repos" \ + IMAGE_DIR="/home/opnfv/images/" # Set work directory # Yardstick repo -ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick -ENV RELENG_REPO_DIR ${REPOS_DIR}/releng -ENV STORPERF_REPO_DIR ${REPOS_DIR}/storperf +ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick" \ + RELENG_REPO_DIR="${REPOS_DIR}/releng" \ + STORPERF_REPO_DIR="${REPOS_DIR}/storperf" -RUN apt-get update && apt-get install -y git python-setuptools python-pip +RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && apt-get clean RUN easy_install -U setuptools==30.0.0 RUN pip install appdirs==1.4.0 @@ -48,5 +48,8 @@ ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-d COPY ./exec_tests.sh /usr/local/bin/ +ENV NSB_DIR="/opt/nsb_bin" \ + PYTHONPATH="${PYTHONPATH}:${NSB_DIR}/trex_client:${NSB_DIR}/trex_client/stl" + WORKDIR ${REPOS_DIR} CMD ["/usr/bin/supervisord"] |