From f13c9190305e5bfb040152b1cfeded98bbcb0346 Mon Sep 17 00:00:00 2001 From: Fabio Roberto Vitello <fabio.vitello@inaf.it> Date: Sun, 24 May 2020 12:11:08 +0200 Subject: [PATCH] ddf2 with public release of pipelines --- ddf2/Dockerfile | 5 ++--- ddf2/build_docker_container.sh | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile index 8d7a589..2c96534 100644 --- a/ddf2/Dockerfile +++ b/ddf2/Dockerfile @@ -10,7 +10,7 @@ ENV PYTHONPATH /opt/lofarsoft/lib/python2.7/site-packages #------------------------ # DDF pipeline RUN cd /opt && git clone https://github.com/mhardcastle/ddf-pipeline.git -RUN cd /opt/ddf-pipeline && git checkout fdaa5aa +RUN cd /opt/ddf-pipeline && git checkout DR1 # SkyModel RUN cd /opt && git clone https://github.com/cyriltasse/SkyModel.git @@ -46,7 +46,6 @@ RUN sed 's/numpy (<=1.16)/numpy (<=1.16.2)/g' /usr/local/lib/python2.7/dist-pac RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git -#USER lofar -ENV CONTAINER_NAME='ddf2_base3.10' +ENV CONTAINER_NAME='ddf2_public_base3.10' ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/' diff --git a/ddf2/build_docker_container.sh b/ddf2/build_docker_container.sh index 7c8ffc5..71c1887 100755 --- a/ddf2/build_docker_container.sh +++ b/ddf2/build_docker_container.sh @@ -1,8 +1,4 @@ #!/bin/bash set -e -rm -rf DDFacet -git clone https://github.com/cyriltasse/DDFacet.git -git checkout 1059028 - -docker build . -t lofarit/ddf2_base3.10 +docker build . -t lofarit/ddf2_public_base3.10 -- GitLab