aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2015-12-23 15:55:33 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-23 15:55:33 +0000
commitf63180c9dfd70c5b9af8838b0d8f8b09a240ca96 (patch)
tree272596901890ae83b11a8cd9d287ea1d0f455758
parent6daa237e66205707e5638ff46e894af81f9f219a (diff)
parentb08448817559b4c0f4050eedee810a452ac1af78 (diff)
Merge "Add 'rvm use system;' to Dockerfile for vIMS"
-rw-r--r--docker/Dockerfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 99d18cad..32323e0c 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'