diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 279e7f683dc89525a1a1763d1a78af2afe03ffbb..a24a7b09e519447a8655c3fb3def38f514163a80 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -28,8 +28,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libgtkmm-3.0-dev \ git \ wget \ - libfftw3-dev - + libfftw3-dev \ + libgsl-dev + RUN mkdir -p /src/ WORKDIR /src/ @@ -48,6 +49,21 @@ RUN cd /src/dp3/ && \ make -j2 && \ make install -j2 +ADD ./STMAN /src/STMAN/src +RUN cd /src/STMAN/ && \ + mkdir build && \ + cd build && \ + cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \ + make -j2 && \ + make install -j2 + +ADD ./Dysco /src/Dysco/src +RUN cd /src/Dysco/ && \ + mkdir build && \ + cd build && \ + cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \ + make -j2 && \ + make install -j2 #---------------------------------------------- FROM kernsuite/base:4 as runner @@ -96,6 +112,13 @@ LABEL LSMTool.version.tag=${LSMTool_TAG} ARG LoSoTo_TAG=master LABEL LoSoTo.version.tag=${LoSoTo_TAG} + +ARG STMAN_TAG=master +LABEL STMAN.version.tag=${STMAN_TAG} + +ARG Dysco_TAG=master +LABEL Dysco.version.tag=${Dysco_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" \ diff --git a/Docker/build_docker.sh b/Docker/build_docker.sh index d8c91fb8986de3e73be754691f1ba173b1322918..7c12feb9d3d26c73745e64bd6dec5ff0eb61aa72 100755 --- a/Docker/build_docker.sh +++ b/Docker/build_docker.sh @@ -5,8 +5,13 @@ git_clone_or_pull () { REPO=$1 BRANCH=$2 DIR=$3 - - git clone --depth 1 -b "${BRANCH}" "${REPO}" "${DIR}" 2> /dev/null || git -C "${DIR}" pull + if [ -d $DIR ] + then + git -C "${DIR}" pull + else + mkdir -p ${DIR} + git clone --depth 1 -b "${BRANCH}" "${REPO}" "${DIR}" + fi } # SOFTWARE VERSIONS @@ -15,7 +20,8 @@ IDG_TAG=0.6 LSMTool_TAG=v1.4.2 LoSoTo_TAG=f0398b TOIL_VERSION=3.20.0 - +STMAN_TAG=master +Dysco_TAG=v1.2 # FETCHES THE IDG git_clone_or_pull https://gitlab.com/astron-idg/idg/ ${IDG_TAG} idg @@ -23,6 +29,13 @@ 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 +# FETCHES STMAN +git_clone_or_pull https://github.com/lofar-astron/LofarStMan ${STMAN_TAG} STMAN + +# FETCHES Dysco +git_clone_or_pull https://github.com/aroffringa/dysco.git ${Dysco_TAG} Dysco + + # FETCHES THE SCRIPTS ONLY BRANCH=production REPO_URL=https://github.com/lofar-astron/prefactor @@ -36,5 +49,7 @@ 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=STMAN_TAG=${STMAN_TAG}\ + --build-arg=Dysco_TAG=${Dysco_TAG}\ --build-arg=TOIL_VERSION=${TOIL_VERSION}\ -t lofareosc/prefactor-ci