diff options
Diffstat (limited to 'docker')
-rw-r--r-- | docker/Dockerfile | 27 | ||||
-rw-r--r-- | docker/Dockerfile.aarch64.patch | 54 |
2 files changed, 60 insertions, 21 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 499624f8..c4b11213 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,12 +2,17 @@ FROM ubuntu:14.04 MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> LABEL version="0.1" description="OPNFV Dovetail Docker Container" +ARG BRANCH=master + RUN \ apt-get update \ && \ apt-get install -y \ + build-essential \ gcc \ git \ + libssl-dev \ + libffi-dev \ vim \ python-dev \ python-mock \ @@ -18,26 +23,26 @@ RUN \ && \ apt-get update -RUN wget -qO- https://get.docker.com/ | sh +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 WORKDIR /home/opnfv RUN \ - git config --global http.sslVerify false \ -&& \ - git clone https://git.opnfv.org/dovetail ${REPOS_DIR} \ + mkdir -p ${REPOS_DIR} \ && \ - mkdir -p ${REPOS_DIR}/results \ -&& \ - pip install -U pip \ -&& \ - pip install -r ${REPOS_DIR}/requirements.txt \ + git config --global http.sslVerify false \ && \ - cd ${REPOS_DIR} \ + pip install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \ && \ - pip install -e . + ln -s /usr/local/lib/python2.7/dist-packages/dovetail ${REPOS_DIR}/dovetail WORKDIR ${REPOS_DIR}/dovetail diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch index b96b619f..424609f0 100644 --- a/docker/Dockerfile.aarch64.patch +++ b/docker/Dockerfile.aarch64.patch @@ -1,32 +1,66 @@ From: Alexandru Nemes <alexandru.nemes@enea.com> -Date: Mon, 24 Apr 2017 11:53:42 +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 | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + docker/Dockerfile | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile -index 8cc15e0..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 \ -@@ -28,6 +28,8 @@ RUN \ +@@ -17,19 +25,12 @@ RUN \ + python-dev \ + python-mock \ + python-pip \ +- apt-transport-https \ + wget \ ++ sudo \ + --no-install-recommends \ && \ - mkdir -p ${REPOS_DIR}/results \ +- apt-get update ++ 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 +@@ -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 \ + pip install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \ |