summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-10-21 10:58:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-21 10:58:07 +0000
commit9a395ec7698cd70da85e9b60153b51b0b13edac4 (patch)
treee31129bcf7687937930517aa62a7a6d41c3a73bb
parent3a017c57f74c35cde137030bc479727ec5f295a5 (diff)
parent76063af9062e18380f3c933cd67a0752361bc28b (diff)
Merge "Remove start.sh in the dockerfile since it is splitted by 2 scripts"
-rw-r--r--docker/Dockerfile10
1 files changed, 7 insertions, 3 deletions
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