Fix the docker version to be 17.03.0-ce rather than the latest one 13/37813/1
authorxudan <xudan16@huawei.com>
Thu, 20 Jul 2017 02:14:07 +0000 (22:14 -0400)
committerxudan <xudan16@huawei.com>
Thu, 20 Jul 2017 02:14:07 +0000 (22:14 -0400)
JIRA: DOVETAIL-467

1. Since the script getting with "wget qO https://get.docker.com/" has been
   changed and it can just install docker-ce rather than docker-engine now.
2. Dovetail validates with Docker 17.03 CE, so the docker installed in the
   dovetail container can be 17.03.0-ce.

Change-Id: If64204ba3dcf5a38d7a124a0cc716f8375808999
Signed-off-by: xudan <xudan16@huawei.com>
docker/Dockerfile

index fbe4849..eb85ea4 100644 (file)
@@ -20,7 +20,13 @@ RUN \
 && \
     apt-get update
 
-RUN wget -qO- https://get.docker.com/ | sed 's/ docker-engine/ docker-engine=1.12.3-0~trusty/' | sh
+RUN wget -qO- https://get.docker.com/ \
+| \
+    sed 's/-q docker-ce/-q docker-ce=17.03.0~ce-0~ubuntu-trusty/' \
+| \
+    sed 's/edge/stable/' \
+| \
+    sh
 
 ENV HOME /home/opnfv
 ENV REPOS_DIR ${HOME}/dovetail