From: MatthewLi <matthew.lijun@huawei.com>
Date: Wed, 14 Dec 2016 02:57:38 +0000 (-0500)
Subject: dovetail tool: fix docker version of client mismatches with server in Docker image
X-Git-Tag: ovp.0.9.0~258^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F25921%2F1;p=dovetail.git

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>
---

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 \