aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2018-01-16 01:11:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-16 01:11:56 +0000
commit35b0d561b96b20042eeb68d70bf4d3268edf08fe (patch)
treec3a4c0d3a57c5a70cd124b4d1b12f8daf12290bc
parenta78ca014513be16e01f43ac070ae040403fe44fe (diff)
parent1c5092ee3169386861444e80c5e33c12ae70d75f (diff)
Merge "Update Dockerfile.aarch64.patch"
-rw-r--r--docker/Dockerfile.aarch64.patch30
1 files changed, 21 insertions, 9 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index 33c352a1b..ca933514a 100644
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -1,14 +1,15 @@
-From: Alexandru Nemes <alexandru.nemes@enea.com>
-Date: Mon, 19 Jun 2017 14:18:24 +0300
+From: Cristina Pauna <cristina.pauna@enea.com>
+Date: Thu, 11 Jan 2018 19:06:26 +0200
Subject: [PATCH] Patch for Yardstick AARCH64 Docker file
+Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
---
- docker/Dockerfile | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ docker/Dockerfile | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
-index 96a5d77..03307a2 100644
+index 2ee5b4c..23e5ea5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
@@ -22,15 +23,25 @@ index 96a5d77..03307a2 100644
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
--FROM ubuntu:14.04
-+FROM aarch64/ubuntu:14.04
+-FROM ubuntu:16.04
++FROM arm64v8/ubuntu:16.04
-LABEL image=opnfv/yardstick
+LABEL image=opnfv/yardstick_aarch64
ARG BRANCH=master
-@@ -40,8 +40,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
+@@ -24,7 +24,8 @@ ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick" \
+ RELENG_REPO_DIR="${REPOS_DIR}/releng" \
+ STORPERF_REPO_DIR="${REPOS_DIR}/storperf"
+
+-RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && apt-get clean
++RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && \
++ apt-get install -y libssl-dev && apt-get -y install libffi-dev && apt-get clean
+ RUN easy_install -U setuptools==30.0.0
+ RUN pip install appdirs==1.4.0 pyopenssl==17.5.0
+
+@@ -43,8 +44,8 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
EXPOSE 5000
@@ -39,4 +50,5 @@ index 96a5d77..03307a2 100644
+ADD http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img ${IMAGE_DIR}
+ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-disk1.img ${IMAGE_DIR}
- COPY ./exec_tests.sh /usr/local/bin/ \ No newline at end of file
+ COPY ./exec_tests.sh /usr/local/bin/
+