Refactor docker

Docker/Dockerfile

@@ -88,13 +88,17 @@ RUN mkdir /home/lofaruser/ && \
     useradd --no-log-init -r -g lofaruser lofaruser && \
     chown lofaruser:lofaruser /home/lofaruser
 
+ARG TOIL_VERSION=3.20.0
+LABEL toil.version=${TOIL_VERSION}
+
 ARG LSMTool_TAG=master
 LABEL LSMTool.version.tag=${LSMTool_TAG}
+
 ARG LoSoTo_TAG=master
 LABEL LoSoTo.version.tag=${LoSoTo_TAG}
     
 RUN apt-get update && apt-get install -y nodejs python3-pip git wsclean
-RUN python3 -m pip install cwltool cwl-runner -e "git://github.com/darafferty/LSMTool.git@${LSMTool_TAG}#egg=LSMTool" git+https://github.com/DataBiosphere/toil
+RUN python3 -m pip install cwltool cwl-runner -e "git://github.com/darafferty/LSMTool.git@${LSMTool_TAG}#egg=LSMTool" toil[cwl]==${TOIL_VERSION}
 
 RUN python3 -m pip install -e "git+https://github.com/revoltek/losoto.git@${LoSoTo_TAG}#egg=LoSoTo"
 

Docker/build_docker.sh

@@ -14,6 +14,8 @@ DP3_TAG=v4.1
 IDG_TAG=0.6
 LSMTool_TAG=v1.4.2
 LoSoTo_TAG=f0398b
+TOIL_VERSION=3.20.0
+
 
 # FETCHES THE IDG
 git_clone_or_pull https://gitlab.com/astron-idg/idg/ ${IDG_TAG} idg
@@ -34,4 +36,5 @@ docker build ${DOCKER_PATH} --build-arg=IDG_TAG=${IDG_TAG}\
                             --build-arg=DP3_TAG=${DP3_TAG}\
                             --build-arg=LSMTool_TAG=${LSMTool_TAG}\
                             --build-arg=LoSoTo_TAG=${LoSoTo_TAG}\
+                            --build-arg=TOIL_VERSION=${TOIL_VERSION}\
                             -t lofareosc/prefactor-ci