summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile8
1 files changed, 3 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 218e25f84..04ebf2c6d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,9 +60,11 @@ crudini \
ruby1.9.1-dev \
--no-install-recommends
+RUN pip install --upgrade pip
RUN mkdir -p ${repos_dir}
RUN mkdir -p /home/opnfv/functest/results
+RUN mkdir -p /home/opnfv/functest/conf
RUN mkdir -p /root/.ssh
RUN chmod 700 /root/.ssh
@@ -88,12 +90,8 @@ RUN git clone https://gerrit.opnfv.org/gerrit/parser ${repos_dir}/parser
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/requirements.txt
-RUN pip install -r ${repos_dir}/parser/tosca2heat/tosca-parser/requirements.txt
-RUN pip install -r ${repos_dir}/parser/tosca2heat/heat-translator/requirements.txt
-RUN cd ${repos_dir}/parser/tosca2heat/tosca-parser && python setup.py install
-RUN cd ${repos_dir}/parser/tosca2heat/heat-translator && python setup.py install
-
+RUN /bin/bash ${repos_dir}/parser/tests/parser_install.sh ${repos_dir}
RUN ${repos_dir}/rally/install_rally.sh --yes
ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/