From 76063af9062e18380f3c933cd67a0752361bc28b Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Tue, 20 Oct 2015 11:37:48 +0200 Subject: Remove start.sh in the dockerfile since it is splitted by 2 scripts See https://gerrit.opnfv.org/gerrit/#/c/2685/ for details: The files to be executed will be: prepare_env.sh run_tests.sh JIRA: FUNCTEST-29 Change-Id: Idca630ff6bc2716e47cca66450dba7b8cb6d5dcf Signed-off-by: jose.lausuch --- docker/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index f1a28027a..95ef22b5d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,9 +9,14 @@ # $ docker build -t opnfv/functest:tag . # # Execution: -# $ docker run -t -i -e "INSTALLER_TYPE=fuel/foreman" \ -# -e "INSTALLER_IP=10.20.0.2/172.30.10.73" opnfv/functest +# $ docker run -t -i \ +# -e "INSTALLER_TYPE=fuel/foreman" \ +# -e "INSTALLER_IP=10.20.0.2/172.30.10.73" \ +# -v $(pwd)/config_functest.yaml:/home/opnfv/functest/conf/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 FROM ubuntu:14.04 @@ -49,4 +54,3 @@ RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally RUN pip install -r ${repos_dir}/functest/docker/requirements.pip -RUN chmod 744 ${repos_dir}/functest/docker/start.sh \ No newline at end of file -- cgit 1.2.3-korg