diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 9 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 33 |
2 files changed, 40 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index f2a543e6..d609273d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,6 +22,9 @@ RUN apt-get update && apt-get install -y \ gcc \ ssh \ expect \ + build-essential\ + libssl-dev\ + libffi-dev\ python-matplotlib \ python-dev \ python-pip \ @@ -32,6 +35,8 @@ RUN apt-get update && apt-get install -y \ curl \ supervisor \ python-setuptools \ + iputils-ping\ + rsync \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* @@ -50,14 +55,14 @@ RUN mkdir -p $HOME/qtip/results RUN chmod 700 /root/.ssh #Config ansible -COPY ansible.cfg.default /root/.ansible.cfg +COPY ansible.cfg.default $HOME/.ansible.cfg #Cloning Repos RUN git config --global http.sslVerify false RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/qtip $REPOS_DIR/qtip RUN git clone https://gerrit.opnfv.org/gerrit/releng $REPOS_DIR/releng -RUN pip install -r $REPOS_DIR/qtip/requirements.txt +RUN pip install -U -r $REPOS_DIR/qtip/requirements.txt #Config supervisor RUN mkdir -p /var/log/supervisor diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch new file mode 100644 index 00000000..80529476 --- /dev/null +++ b/docker/Dockerfile.aarch64.patch @@ -0,0 +1,33 @@ +From: Cristina Pauna <cristina.pauna@enea.com> +Date: Mon, 13 Mar 2017 11:56:59 +0200 +Subject: [PATCH] Modify Dockerfile to build an aarch64 image + +This patch adapts the Dockerfile so that the qtip image +can be build on an aarch64 machine + +Signed-off-by: Cristina Pauna <cristina.pauna@enea.com> +--- + docker/Dockerfile | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/docker/Dockerfile b/docker/Dockerfile +index a4a7e47..5d4467b 100644 +--- a/docker/Dockerfile ++++ b/docker/Dockerfile +@@ -1,10 +1,10 @@ +-########################################## +-#####Docker container for QTIP############ +-########################################## ++################################################### ++##### AArch64 Docker container for QTIP############ ++################################################### + +-FROM ubuntu:16.04 +-MAINTAINER Yujun Zhang <zhang.yujunz@zte.com.cn> +-LABEL version="0.1" description="OPNFV QTIP Docker container" ++FROM aarch64/ubuntu:16.04 ++MAINTAINER Armband team <armband@enea.com> ++LABEL version="0.1" description="OPNFV QTIP AArch64 Docker container" + + ARG BRANCH=master + |