Commit a089f3e8 authored by Keller Patrick's avatar Keller Patrick

Merge branch 'dev' of ssh://git.scicore.unibas.ch:2222/krini/krini-cwl into dev

parents 148493ea 434a131f
......@@ -36,7 +36,8 @@ RUN apt-get -y install build-essential checkinstall \
&& tar xvf Python-3.6.0.tar.xz \
&& cd Python-3.6.0/ \
&& ./configure \
&& make altinstall
&& make altinstall \
&& apt-get install sqlite3
COPY Flask/ /krinicwl/
COPY requirements.txt /krinicwl/
......@@ -45,6 +46,4 @@ RUN pip3.6 install -r requirements.txt
WORKDIR /krinicwl/cwlREST
EXPOSE 5000
CMD ["python3.6", "cwlRESTService.py"]
\ No newline at end of file
CMD ["python3.6", "cwlRESTService.py"]
cloneTest @ b6bcec5d
Subproject commit b6bcec5dd4ef7377e4700ab3c380139437c2468a
......@@ -547,5 +547,5 @@ class WorkflowWrapper(threading.Thread):
############################################################
if __name__ == '__main__':
CWLRestAPI.register(app, route_base="/")
app.run()
app.run(host='0.0.0.0')
#call this file with "python3.6 cwl.py"
......@@ -107,7 +107,7 @@ class WES_DAO:
outputs = session.query(OutputData).filter_by(workflowid=workflowid).all()
if tasks:
requestDict = collections.OrderedDict([
('workflow_descriptor', workflow.descriptor),
('workflow_descriptor', workflow.workflow_descriptor),
('workflow_params',{}),
('workflow_type',workflow.workflow_type),
('workflow_type_version',workflow.workflow_type_version),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment