From af798ce161d0a074823344fafb4984cc6f35ceec Mon Sep 17 00:00:00 2001 From: Cristina Pauna Date: Thu, 9 Mar 2017 15:14:17 +0200 Subject: Add aarch64 patch This commit adds a patch that can be applied to the Dockerfile to adapt it for aarch64. When applied from releng, a new Dockerfile.aarch64 is created and an aarch64 qtip image is created. The aarch64 qtip image will be build with the releng fix https://gerrit.opnfv.org/gerrit/30181 JIRA: ARMBAND-219 Change-Id: I551ae7fa1d7fc23c6e5f6381d605b0b22dbec695 Signed-off-by: Cristina Pauna (cherry picked from commit 2935006a650f92255c8046d236e691360148d9ff) --- docker/Dockerfile.aarch64.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 docker/Dockerfile.aarch64.patch (limited to 'docker') 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 +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 +--- + 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 +-LABEL version="0.1" description="OPNFV QTIP Docker container" ++FROM aarch64/ubuntu:16.04 ++MAINTAINER Armband team ++LABEL version="0.1" description="OPNFV QTIP AArch64 Docker container" + + ARG BRANCH=master + -- cgit 1.2.3-korg