From be52504f137b392bcf9ea1dbc13240350ea2f39a Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 9 Mar 2016 14:08:38 +0100 Subject: Have vIMS and Promise packages pre installed in the docker image. Also, change to master in Functest repo. JIRA: FUNCTEST-148 Change-Id: Ie4f3991adde9296fe86d4bedd4a9ca5e8aea33b3 Signed-off-by: jose.lausuch --- docker/Dockerfile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 3a39c4c5c..71032a45a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -64,7 +64,7 @@ RUN mkdir -p /root/.ssh RUN chmod 700 /root/.ssh RUN git config --global http.sslVerify false -RUN git clone -b stable/brahmaputra https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest +RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally @@ -78,7 +78,7 @@ RUN git clone https://gerrit.opnfv.org/gerrit/ovno ${repos_dir}/ovno RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN pip install -r ${repos_dir}/rally/requirements.txt -RUN pip install -r ${repos_dir}/tempest/pip install -r requirements.txt +RUN pip install -r ${repos_dir}/tempest/requirements.txt RUN ${repos_dir}/rally/install_rally.sh --yes @@ -87,6 +87,24 @@ 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 /bin/bash -c ". /etc/profile.d/rvm.sh \ + && cd /home/opnfv/repos/vims-test \ + && rvm autolibs enable" +RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ + && cd /home/opnfv/repos/vims-test \ + && rvm install 1.9.3" +RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ + && cd /home/opnfv/repos/vims-test \ + && rvm use 1.9.3" +RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ + && cd /home/opnfv/repos/vims-test \ + && bundle install" + +RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' +RUN sudo apt-get install -y nodejs +RUN cd ${repos_dir}/promise && sudo npm -g install npm@latest +RUN cd ${repos_dir}/promise && npm install + RUN /bin/echo -e "set nocompatible\nset backspace=2" >> /home/opnfv/.vimrc RUN echo "set nocompatible" >> /home/opnfv/.exrc RUN echo "alias ll='ls -lh'" >> /home/opnfv/.bashrc -- cgit 1.2.3-korg