summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Nemes <alexandru.nemes@enea.com>2017-08-10 17:52:56 +0300
committerAlexandru Nemes <alexandru.nemes@enea.com>2017-08-10 15:47:12 +0000
commite0f8b5acc8efca37607d6de04a1d592d7d019ee2 (patch)
tree288d56b2b4d015e6d1b9911a43c78aa69349c193
parent0037e756452b042cdba50a28285cc9f9797b0586 (diff)
Remake aarch64 patch for Dovetail container
JIRA: ARMBAND-286 Change-Id: Ided665488c7240943f62c65df0535d8b0178459f Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
-rw-r--r--docker/Dockerfile.aarch64.patch53
1 files changed, 38 insertions, 15 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index 50fdc75..424609f 100644
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -1,43 +1,66 @@
From: Alexandru Nemes <alexandru.nemes@enea.com>
-Date: Mon, 8 May 2017 19:04:37 +0300
+Date: Thu, 10 Aug 2017 18:45:31 +0300
Subject: [PATCH] Add AArch64 support for Dovetail docker file
Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
---
- docker/Dockerfile | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
+ docker/Dockerfile | 29 +++++++++++++++++------------
+ 1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
-index 499624f..bbab012 100644
+index c4b1121..1ad54cc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,16 @@
-FROM ubuntu:14.04
-MAINTAINER Leo Wang <grakiss.wanglei@huawei.com>
-LABEL version="0.1" description="OPNFV Dovetail Docker Container"
+FROM aarch64/ubuntu:16.04
+MAINTAINER Armband team <armband@enea.com>
+LABEL version="0.1" description="OPNFV Dovetail AArch64 Docker Container"
++
++RUN apt-get update
+
+ ARG BRANCH=master
++ARG SUB_SOURCE_FILE=/etc/apt/sources.list.d/dovetail.list
++
++RUN touch $SUB_SOURCE_FILE
++RUN echo "deb [arch=arm64] https://download.docker.com/linux/ubuntu/ xenial test" >> ${SUB_SOURCE_FILE}
++#preinstalling apt-transport-https in order to install docker-ce from the above repo
++RUN apt-get install -y apt-transport-https
RUN \
apt-get update \
-@@ -16,9 +16,7 @@ RUN \
+@@ -17,19 +25,12 @@ RUN \
+ python-dev \
+ python-mock \
+ python-pip \
+- apt-transport-https \
wget \
++ sudo \
--no-install-recommends \
&& \
- apt-get update
--
--RUN wget -qO- https://get.docker.com/ | sh
-+ apt-get update && apt-get -y install docker.io
++ apt-get update && apt-get -y install docker-ce --allow-unauthenticated
+
+-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
-@@ -31,6 +29,8 @@ RUN \
- && \
- mkdir -p ${REPOS_DIR}/results \
+@@ -38,6 +39,10 @@ WORKDIR /home/opnfv
+ RUN \
+ mkdir -p ${REPOS_DIR} \
&& \
-+ pip install -U setuptools \
++ pip install -U setuptools --upgrade \
++&& \
++ pip install -U wheel \
+&& \
- pip install -U pip \
+ git config --global http.sslVerify false \
&& \
- pip install -r ${REPOS_DIR}/requirements.txt \ \ No newline at end of file
+ pip install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \