diff options
| author |   xudan <xudan16@huawei.com> | 2017-12-20 22:36:30 -0500 |
|---|---|---|
| committer | Dan Xu <xudan16@huawei.com> | 2017-12-23 08:45:44 +0000 |
| commit | f47a55954465bd2b9471702d29bdd84301471ea1 (patch) | |
| tree | d8213134cf70d46c8a218679677b64272629b790 /docker | |
| parent | 94c37901440510d5bc4e8edbfc02648a73f538a6 (diff) | |
Fix aarch64 patch for Dovetail container
Change-Id: I3746136e9002a14eea81c38ea54cbbad7fa68da1
Signed-off-by: xudan <xudan16@huawei.com>
(cherry picked from commit eefdd18e83e6aa15f8abf9671822f3a623c17171)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index 424609f0..79ba5ff9 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -1,14 +1,14 @@ -From: Alexandru Nemes <alexandru.nemes@enea.com> -Date: Thu, 10 Aug 2017 18:45:31 +0300 +From: xudan <xudan16@huawei.com> +Date: Wed, 20 Dec 2017 22:23:13 -0500 Subject: [PATCH] Add AArch64 support for Dovetail docker file -Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com> +Signed-off-by: xudan <xudan16@huawei.com> --- - docker/Dockerfile | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) + docker/Dockerfile | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile -index c4b1121..1ad54cc 100644 +index c5239db..25e2105 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,16 @@ @@ -31,7 +31,7 @@ index c4b1121..1ad54cc 100644 RUN \ apt-get update \ -@@ -17,19 +25,12 @@ RUN \ +@@ -17,22 +25,14 @@ RUN \ python-dev \ python-mock \ python-pip \ @@ -43,6 +43,8 @@ index c4b1121..1ad54cc 100644 - apt-get update + apt-get update && apt-get -y install docker-ce --allow-unauthenticated + RUN easy_install -U setuptools==30.0.0 + -RUN wget -qO- https://get.docker.com/ \ -| \ - sed 's/-q docker-ce/-q docker-ce=17.03.0~ce-0~ubuntu-trusty/' \ @@ -50,10 +52,11 @@ index c4b1121..1ad54cc 100644 - sed 's/edge/stable/' \ -| \ - sh - +- ENV HOME /home/opnfv ENV REPOS_DIR ${HOME}/dovetail -@@ -38,6 +39,10 @@ WORKDIR /home/opnfv + WORKDIR /home/opnfv +@@ -40,6 +40,10 @@ WORKDIR /home/opnfv RUN \ mkdir -p ${REPOS_DIR} \ && \ |