diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 516becf3e383588a2430943e4cdacb09cfa065c2..fce6e8716d69c875c36d7793ed82bc4810b2e383 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -89,11 +89,14 @@ RUN mkdir /home/lofaruser/ && \ chown lofaruser:lofaruser /home/lofaruser 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" -RUN python3 -m pip install git+https://github.com/revoltek/losoto.git +RUN python3 -m pip install -e "git+https://github.com/revoltek/losoto.git@${LoSoTo_TAG}#egg=LoSoTo" ADD L570745_uv_first10.MS.tar.xz /data ADD skymodels.tar.gz /data/skymodels diff --git a/Docker/build_docker.sh b/Docker/build_docker.sh index 33efd28ebad48c96dcd4baddce0c7a881e14a1e3..667b4fdc818b88be06335800a7f8103d8de6698b 100755 --- a/Docker/build_docker.sh +++ b/Docker/build_docker.sh @@ -5,20 +5,21 @@ git_clone_or_pull () { REPO=$1 BRANCH=$2 DIR=$3 - - git clone -single-branch -b "${BRANCH}" "${REPO}" "${DIR}" 2> /dev/null || git -C "${DIR}" pull + + git clone --single-branch -b "${BRANCH}" "${REPO}" "${DIR}" 2> /dev/null || git -C "${DIR}" pull } # SOFTWARE VERSIONS DP3_TAG=v4.1 IDG_TAG=0.6 LSMTool_TAG=v1.4.2 +LoSoTo_TAG=f0398b # FETCHES THE IDG git_clone_or_pull https://gitlab.com/astron-idg/idg/ ${IDG_TAG} idg # FETCHES DP3 -git_clone_or_pull https://github.com/lofar-astron/DP3 ${DP3_TAG} DP3 +git_clone_or_pull https://github.com/lofar-astron/DP3 ${DP3_TAG} DP3 # FETCHES THE SCRIPTS ONLY BRANCH=production @@ -29,4 +30,8 @@ SCRIPT_PATH=$(realpath ${BASH_SOURCE[0]}) DOCKER_PATH=$(dirname ${SCRIPT_PATH}) -docker build ${DOCKER_PATH} --build-arg=IDG_TAG=${IDG_TAG} --build-arg=DP3_TAG=${DP3_TAG} --build-arg=LSMTool_TAG=${LSMTool_TAG} -t lofareosc/prefactor-ci +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}\ + -t lofareosc/prefactor-ci