1 From: Delia Popescu <delia.popescu@enea.com>
2 Date: Thu, 20 Jul 2017 17:36:13 +0300
3 Subject: [PATCH] Modified Dockerfile.aarch to a patch
5 Docker image for functest on ARM was build using a different Dockerfile.
6 Now the ARM Dockerfile is created with a patch,
7 in order to avoid modifying both files.
8 This Dockerfile.aarch64.patch is applied by opnfv-docker.sh from releng project.
10 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
12 docker/Dockerfile | 15 +++++++++------
13 1 file changed, 9 insertions(+), 6 deletions(-)
15 diff --git a/docker/Dockerfile b/docker/Dockerfile
16 index 924da68..dd87e6c 100644
17 --- a/docker/Dockerfile
18 +++ b/docker/Dockerfile
20 ########################################
21 -# Docker container for FUNCTEST
22 +# Aarch64 Docker container for FUNCTEST
23 ########################################
24 # All rights reserved. This program and the accompanying materials
25 # are made available under the terms of the Apache License, Version 2.0
27 # http://www.apache.org/licenses/LICENSE-2.0
29 -MAINTAINER Jose Lausuch <jose.lausuch@ericsson.com>
30 -LABEL version="0.1" description="OPNFV Functest Docker container"
31 +FROM aarch64/ubuntu:14.04
32 +MAINTAINER Armband team <armband@enea.com>
33 +LABEL version="0.1" description="OPNFV Functest Aarch64 Docker container"
34 # Environment variables
36 @@ -43,6 +43,7 @@ gcc \
44 @@ -117,11 +118,13 @@ RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
45 && cd ${REPOS_VNFS_DIR}/vims-test \
47 RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
48 + && gem install bundler \
49 && cd ${REPOS_VNFS_DIR}/vims-test \
50 + && bundle config build.nokogiri --use-system-libraries \
52 -RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \
53 - && sudo apt-get install -y nodejs \
54 +RUN sh -c 'wget -qO- https://nodejs.org/dist/v4.7.2/node-v4.7.2-linux-arm64.tar.gz | \
55 + tar -xz -C /usr/local --exclude=CHANGELOG.md --exclude=LICENSE --exclude=README.md --strip-components 1 '\
56 && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \
57 && cd ${REPOS_DIR}/promise/source && npm install