From 6c52d16a4e40d6517a454511117ac49e1e34bb09 Mon Sep 17 00:00:00 2001
From: helenyao <yaohelan@huawei.com>
Date: Fri, 3 Feb 2017 01:38:16 -0500
Subject: Freeze the rally version

1. Installed latest released version of rally as 0.8.1
2. Removed outdated description

Change-Id: Iebc8c65809dc814fe51aab27f0721b01fd6feb4b
Signed-off-by: helenyao <yaohelan@huawei.com>
---
 docker/Dockerfile | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'docker/Dockerfile')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dda4ea6e6..1cc2209e5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,23 +1,6 @@
 ########################################
 #   Docker container for FUNCTEST
 ########################################
-# Purpose: run all the tests against the POD
-#          from a pre-installed docker image
-#
-# Maintained by Jose Lausuch
-# Build:
-#    $ docker build -t opnfv/functest:tag .
-#
-# Execution:
-#    $ docker run -t -i \
-#      -e "INSTALLER_TYPE=fuel|apex|compass|joid \
-#      -e "INSTALLER_IP=10.20.0.2" \
-#      -v $(pwd)/config_functest.yaml:/home/opnfv/repos/functest/functest/ci/config_functest.yaml
-#      opnfv/functest /bin/bash
-#
-# NOTE: providing config_functest.yaml is optional. If not provided, it will
-#       use the default one located in the repo
-#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -30,6 +13,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
 
 # Environment variables
 ARG BRANCH=master
+ARG RALLY_TAG=0.8.1
 ARG TEMPEST_TAG=14.0.0
 ARG ODL_TAG=release/beryllium-sr4
 ARG OPENSTACK_TAG=stable/mitaka
@@ -107,7 +91,7 @@ RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${REPOS_DIR}/rele
 # OpenStack repositories
 RUN git clone --depth 1 -b $OPENSTACK_TAG https://github.com/openstack/networking-bgpvpn ${REPOS_DIR}/bgpvpn
 #RUN git clone --depth 1 -b $KINGBIRD_TAG https://github.com/openstack/kingbird.git ${REPOS_DIR}/kingbird
-RUN git clone https://github.com/openstack/rally.git ${REPOS_DIR}/rally
+RUN git clone --depth 1 -b $RALLY_TAG https://github.com/openstack/rally.git ${REPOS_DIR}/rally
 RUN git clone --depth 1 -b $TEMPEST_TAG https://github.com/openstack/tempest.git ${REPOS_DIR}/tempest
 
 # other repositories
-- 
cgit