From b08448817559b4c0f4050eedee810a452ac1af78 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Wed, 23 Dec 2015 12:09:25 +0100
Subject: [PATCH] Add 'rvm use system;' to Dockerfile for vIMS
JIRA: FUNCTEST-120
Also changed the order of the image command
Change-Id: Iecd4025929b93f64356a79cf45df1d1eca257a36
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
docker/Dockerfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 99d18cade..32323e0cf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -64,10 +64,11 @@ RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test
RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn
RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
+RUN pip install -r ${repos_dir}/rally/requirements.txt
+
+ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/
RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
RUN curl -L https://get.rvm.io | bash -s stable
RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3'
-RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test ; bundle install'
-
-ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/
\ No newline at end of file
+RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test ; rvm use 1.9.3; bundle install'
--
2.16.6