Fix AArch64 nested Docker install

Due to recent changes in official Dovetail Dockerfile,
which is running on Ubuntu 14.04, we need some changes
in our patch file for aarch64 in order to keep it working
on 16.04.

JIRA: ARMBAND-258

Change-Id: Icff8c5a16d90ec4b67204a5b525a7896c796ca11
Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>

diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index b96b619..50fdc75 100644 (file)
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -1,14 +1,14 @@
 From: Alexandru Nemes <alexandru.nemes@enea.com>
-Date: Mon, 24 Apr 2017 11:53:42 +0300
+Date: Mon, 8 May 2017 19:04:37 +0300
 Subject: [PATCH] Add AArch64 support for Dovetail docker file
 
 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
 ---
- docker/Dockerfile | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ docker/Dockerfile | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/docker/Dockerfile b/docker/Dockerfile
-index 8cc15e0..bbab012 100644
+index 499624f..bbab012 100644
 --- a/docker/Dockerfile
 +++ b/docker/Dockerfile
 @@ -1,6 +1,6 @@
@@ -21,7 +21,18 @@ index 8cc15e0..bbab012 100644
 
  RUN \
      apt-get update \
-@@ -28,6 +28,8 @@ RUN \
+@@ -16,9 +16,7 @@ RUN \
+         wget \
+         --no-install-recommends \
+ && \
+-    apt-get update
+-
+-RUN wget -qO- https://get.docker.com/ | sh
++    apt-get update &&  apt-get -y install docker.io
+
+ ENV HOME /home/opnfv
+ ENV REPOS_DIR ${HOME}/dovetail
+@@ -31,6 +29,8 @@ RUN \
  && \
      mkdir -p ${REPOS_DIR}/results \
  && \
@@ -29,4 +40,4 @@ index 8cc15e0..bbab012 100644
 +&& \
      pip install -U pip \
  && \
-     pip install -r ${REPOS_DIR}/requirements.txt \
+     pip install -r ${REPOS_DIR}/requirements.txt \
\ No newline at end of file