diff options
| author |   Leo Wang <grakiss.wanglei@huawei.com> | 2016-09-22 21:56:54 -0400 |
|---|---|---|
| committer | Leo Wang <grakiss.wanglei@huawei.com> | 2016-09-30 05:30:22 -0400 |
| commit | 39942dc9c5bc152a6ed20534755cc0dc38d85ede (patch) | |
| tree | 8d4a980e7454b26cd97216a8e91de6c947692e9a /docker | |
| parent | c554b6951f8ee8298d3f8ae8f53ba468dbf4c164 (diff) | |
Use template to unify commands in functest/yardstick
JIRA: DOVETAIL-19
1. use jinja2 to unify commands in config files
2. it simplify the process of test execution, put the dissimilarity in config
3. add precondition/postcondition for functest/yardstick config
Change-Id: Ib996b11ea065b61910b34b78191bb7b1ffd92e59
Signed-off-by: Leo Wang <grakiss.wanglei@huawei.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8d6883c1..bdf5a40d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,23 +2,36 @@ FROM ubuntu:14.04 MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> LABEL version="0.1" description="OPNFV Dovetail Docker Container" -RUN apt-get update && apt-get install -y \ -docker.io \ -python-pip \ -git \ ---no-install-recommends - -RUN pip install pyyaml -RUN pip install click +RUN \ + apt-get update \ +&& \ + apt-get install -y \ + python-pip \ + git \ + apt-transport-https \ + --no-install-recommends \ +&& \ + apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \ +&& \ + mkdir -p /etc/apt/sources.list.d \ +&& \ + echo deb https://apt.dockerproject.org/repo ubuntu-trusty main > /etc/apt/sources.list.d/docker.list \ +&& \ + apt-get update && apt-get install -y docker-engine=1.9.1-0~trusty \ +&& \ + pip install pyyaml \ + click \ + jinja2 ENV HOME /home/opnfv ENV REPOS_DIR /home/opnfv/dovetail WORKDIR /home/opnfv -RUN git config --global http.sslVerify false -RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git ${REPOS_DIR} - -RUN mkdir -p ${REPOS_DIR}/results +RUN \ + git config --global http.sslVerify false \ +&& \ + git clone https://gerrit.opnfv.org/gerrit/dovetail.git ${REPOS_DIR} \ +&& \ + mkdir -p ${REPOS_DIR}/results WORKDIR /home/opnfv/dovetail/scripts - |