diff options
| author |   xudan <xudan16@huawei.com> | 2017-12-23 03:15:02 -0500 |
|---|---|---|
| committer |   Leo wang <grakiss.wanglei@huawei.com> | 2017-12-25 01:59:39 +0000 |
| commit | dd494da67bb690229fc3d1a247b638a093196a8b (patch) | |
| tree | ac3654304fe422627269fa9ac4237b6b0683fc00 | |
| parent | e7912589acafa0ca4e456396c6bc5301aee496fc (diff) | |
[bugfix] easy_install: not found
Remove easy_install because it will be installed later.
Change-Id: I29f425e0a5784b581a5b65ea5c8f8db66fc9dc8e
Signed-off-by: xudan <xudan16@huawei.com>
(cherry picked from commit 6bda989aab98198118d59b6a16da05d7aef74265)
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index 79ba5ff9..68f002c0 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -1,14 +1,14 @@ From: xudan <xudan16@huawei.com> -Date: Wed, 20 Dec 2017 22:23:13 -0500 +Date: Sat, 23 Dec 2017 03:10:19 -0500 Subject: [PATCH] Add AArch64 support for Dovetail docker file Signed-off-by: xudan <xudan16@huawei.com> --- - docker/Dockerfile | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) + docker/Dockerfile | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile -index c5239db..25e2105 100644 +index c5239db..b4fd9f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,16 @@ @@ -31,7 +31,7 @@ index c5239db..25e2105 100644 RUN \ apt-get update \ -@@ -17,22 +25,14 @@ RUN \ +@@ -17,21 +25,11 @@ RUN \ python-dev \ python-mock \ python-pip \ @@ -41,10 +41,9 @@ index c5239db..25e2105 100644 --no-install-recommends \ && \ - apt-get update -+ apt-get update && apt-get -y install docker-ce --allow-unauthenticated - - RUN easy_install -U setuptools==30.0.0 - +- +-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/' \ @@ -52,11 +51,11 @@ index c5239db..25e2105 100644 - sed 's/edge/stable/' \ -| \ - sh -- ++ apt-get update && apt-get -y install docker-ce --allow-unauthenticated + ENV HOME /home/opnfv ENV REPOS_DIR ${HOME}/dovetail - WORKDIR /home/opnfv -@@ -40,6 +40,10 @@ WORKDIR /home/opnfv +@@ -40,6 +38,10 @@ WORKDIR /home/opnfv RUN \ mkdir -p ${REPOS_DIR} \ && \ |