diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2016-12-13 21:57:38 -0500 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2016-12-13 22:01:21 -0500 |
| commit | 50c1cb7364494e1bf9ffec28b2562522ace6b3cd (patch) | |
| tree | dde40b70ff82c825941919d90ba194353c84e810 | |
| parent | 4cc82a8477e7b842e83281c72127a73da73edf1d (diff) | |
dovetail tool: fix docker version of client mismatches with server in Docker image
JIRA: DOVETAIL-160
errors see
https://build.opnfv.org/ci/view/dovetail/job/dovetail-fuel-arm-pod3-debug-master/4/console
Change-Id: I812453fa7ac26cfdf66609c1ca4ac96e29ca7e02
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
| -rw-r--r-- | docker/Dockerfile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 19dc3619..2e919ee2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,13 +13,7 @@ RUN \ 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.12.3-0~trusty \ + apt-get update && apt-get -y install docker.io \ && \ pip install pyyaml \ click \ |