diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2016-11-30 20:53:22 -0500 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2016-11-30 22:30:19 -0500 |
| commit | e566377adc4745428f1ce16f4212628ed64f09ee (patch) | |
| tree | 0dd237f15ce5cae67305071d8a9bb103cd5d9543 | |
| parent | 41835d3fdeb7249198b4352fafc30515f9e0ec55 (diff) | |
bugfix: Add BRANCH Argument in the Dockerfile
JIRA: DOVETAIL-147
1) BRANCH argument added to fix bug in CI
2) docker to use latest version, since BRANCH added not works with old version
Change-Id: Icb0144896389b0cb7ac80e1fb0338825be50d5b1
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
| -rw-r--r-- | docker/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index cc21203d..19dc3619 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,6 +2,8 @@ FROM ubuntu:14.04 MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> LABEL version="0.1" description="OPNFV Dovetail Docker Container" +ARG BRANCH=master + RUN \ apt-get update \ && \ @@ -17,7 +19,7 @@ RUN \ && \ 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 \ + apt-get update && apt-get install -y docker-engine=1.12.3-0~trusty \ && \ pip install pyyaml \ click \ @@ -30,7 +32,7 @@ WORKDIR /home/opnfv RUN \ git config --global http.sslVerify false \ && \ - git clone https://gerrit.opnfv.org/gerrit/dovetail.git ${REPOS_DIR} \ + git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/dovetail.git ${REPOS_DIR} \ && \ mkdir -p ${REPOS_DIR}/results |