summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch64.patch23
2 files changed, 17 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 499624f8..0401af71 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,8 +29,6 @@ RUN \
&& \
git clone https://git.opnfv.org/dovetail ${REPOS_DIR} \
&& \
- mkdir -p ${REPOS_DIR}/results \
-&& \
pip install -U pip \
&& \
pip install -r ${REPOS_DIR}/requirements.txt \
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index b96b619f..50fdc75c 100644
--- 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