From: Jose Lausuch <jose.lausuch@ericsson.com>
Date: Tue, 29 Dec 2015 17:04:32 +0000 (+0000)
Subject: Merge "Support for removing hanging ports"
X-Git-Tag: brahmaputra.1.0~220
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4f7e44541bd8c1d20d547891170e48e521f5db3c;hp=675652f37c57fe61900d2ac5735b0be9b6269252;p=functest.git

Merge "Support for removing hanging ports"
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 32323e0cf..decce6812 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,6 +48,7 @@ libgmp3-dev \
 libxml2-dev \
 libffi-dev \
 crudini \
+ruby1.9.1-dev \
 --no-install-recommends
 
 
@@ -71,4 +72,4 @@ ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/op
 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 ; rvm use 1.9.3; bundle install'
+RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test;rvm use system;bundle install'