Merge branch 'HBA_calibrator' of https://git.astron.nl/eosc/prefactor3-cwl into HBA_calibrator

Former-commit-id: 2073b944

Docker/Dockerfile

@@ -3,8 +3,10 @@ USER root
 COPY prefactor/scripts/* /opt/lofar/scripts/
 COPY prefactor/skymodels/* /data/skymodels/
 COPY prefactor/rfistrategies/* /data/rfistrategies/
-COPY prefactor/solutions/ /data/solutions/*
-RUN apt update && apt install -y vim 
+COPY prefactor/solutions/* /data/solutions/
+COPY lofar /lofar/src
+
+RUN apt update && apt install -y vim  
 RUN pip3 install --upgrade pip && pip3 install --upgrade numpy scipy
 RUN ln -sf /opt/lofar/scripts/* /usr/local/bin/
 

Docker/build_docker.sh

@@ -14,14 +14,14 @@ git_clone_or_pull () {
 }
 
 Prefactor_TAG=production
+LOFAR_TAG=LOFAR-Release-4_0_17
 
 # FETCHES Prefactor
 git_clone_or_pull https://github.com/lofar-astron/prefactor.git ${Prefactor_TAG} prefactor
-
+git_clone_or_pull https://git.astron.nl/ro/lofar.git ${LOFAR_TAG} lofar
 SCRIPT_PATH=$(realpath ${BASH_SOURCE[0]})
 
 DOCKER_PATH=$(dirname ${SCRIPT_PATH})
 
 docker build ${DOCKER_PATH} -t lofareosc/prefactor
-
 docker build ${DOCKER_PATH} -f ${DOCKER_PATH}/Dockerfile_ci -t lofareosc/prefactor-ci