Merge branch 'feature/ddf2' into develop (fae3ff33) · Commits · lofarit / containers

.DS_Store

0 → 100644

+10 KiB

File added.

No diff preview for this file type.

View file

.gitignore

0 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line

			ddf2/DDFacet/
			ddf2/killMS/

base/Dockerfile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,8 @@ RUN apt update
	# Git, Curl, sudo and Nano		# Git, Curl, sudo and Nano
	RUN apt-get install git curl sudo nano -y		RUN apt-get install git curl sudo nano -y

			RUN cd /opt/ && git clone https://github.com/lofar-astron/LOFARBeam.git
			RUN mkdir /opt/LOFARBeam/build && cd /opt/LOFARBeam/build && cmake -DCMAKE_INSTALL_PREFIX=/opt/lofarsoft -DPYTHON_EXECUTABLE=$(which python) -DCASACORE_INCLUDE_DIRS=/opt/lofarsoft/include/casacore/ -DCASACORE_LIBRARIES=/opt/lofarsoft/lib/ -DCASACORE_ROOT_DIR=/opt/lofarsoft/ ../ && make -j16 && make install
	#------------------------		#------------------------
	# Lofar user		# Lofar user
	#------------------------		#------------------------

base/entrypoint.sh

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@ set -e
	echo ""		echo ""
	echo "[INFO] Executing entrypoint..."		echo "[INFO] Executing entrypoint..."

	echo "[INFO] Sourcing env in /opt/lofarsoft/lofarinit.sh..."		#echo "[INFO] Sourcing env in /opt/lofarsoft/lofarinit.sh..."
	source /opt/lofarsoft/lofarinit.sh		source /opt/lofarsoft/lofarinit.sh

	echo "[INFO] Creating /tmp/lofarhome to be used as lofar home"		echo "[INFO] Creating /tmp/lofarhome to be used as lofar home"

ddf2/Dockerfile

+19 −9

Original line number	Original line	Diff line number	Diff line
	FROM lofarit/base3.10		FROM lofarit/base3.10

			USER root

			RUN apt-get install llvm-7 -y
			ENV LLVM_CONFIG=llvm-config-7
			ENV PYTHONPATH /opt/lofarsoft/lib/python2.7/site-packages
	#------------------------		#------------------------
	# Get and install ddf2		# Get and install ddf2
	#------------------------		#------------------------
	USER root

	# DDF pipeline		# DDF pipeline
	RUN cd /opt && git clone https://github.com/mhardcastle/ddf-pipeline.git		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 fdaa5aa
	@@ -14,8 +17,8 @@ RUN cd /opt && git clone https://github.com/cyriltasse/SkyModel.git
	RUN cd /opt/SkyModel && git checkout 026997f		RUN cd /opt/SkyModel && git checkout 026997f

	# killMS		# killMS
	RUN cd /opt && git clone https://github.com/saopicc/killMS.git		COPY killMS /opt/killMS
	RUN cd /opt/killMS && git checkout b9e6ab6 #lofar-stable branch latest commit @ 24 Apr 2020		#RUN cd /opt/killMS && python setup.py build
	RUN cd /opt/killMS/Predict && make		RUN cd /opt/killMS/Predict && make
	RUN cd /opt/killMS/Array/Dot && make		RUN cd /opt/killMS/Array/Dot && make
	RUN cd /opt/killMS/Gridder && make		RUN cd /opt/killMS/Gridder && make
	@@ -27,16 +30,23 @@ RUN cd /opt/DynSpecMS && git checkout 461183f
	# DDFacet		# DDFacet
	COPY DDFacet /opt/DDFacet		COPY DDFacet /opt/DDFacet
	RUN cp /opt/ddf-pipeline/misc/setup.cfg /opt/DDFacet/ # Fix compile options		RUN cp /opt/ddf-pipeline/misc/setup.cfg /opt/DDFacet/ # Fix compile options
			RUN python -m pip install -U pip setuptools wheel
	RUN pip install -U pip setuptools wheel		RUN pip install -U pip setuptools wheel
	RUN python -m pip install pybind11 future pyregion sshtunnel pymysql psutil		RUN python -m pip install numpy==1.16.2 bdsf==1.8.15 emcee
	#RUN python -m pip install -U "/opt/DDFacet/[dft-support,moresane-support,testing-requirements,fits-beam-support]"
			RUN python -m pip install astropy_healpix pybind11 future pyregion sshtunnel pymysql psutil
			RUN python -m pip install -U "/opt/DDFacet/[dft-support,moresane-support,testing-requirements,fits-beam-support]"

	RUN cd /opt/DDFacet && python setup.py build		RUN cd /opt/DDFacet && rm -rf /opt/DDFacet/Dcbuild && python setup.py build

			RUN python -m pip install bdsf==1.8.15 numpy==1.16.2
	RUN sed -e "s\|INSTALLDIR\|/opt\|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh		RUN sed -e "s\|INSTALLDIR\|/opt\|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh

			RUN sed 's/numpy (<=1.16)/numpy (<=1.16.2)/g' /usr/local/lib/python2.7/dist-packages/meqtrees_cattery-1.7.0.dist-info/METADATA > /usr/local/lib/python2.7/dist-packages/meqtrees_cattery-1.7.0.dist-info/METADATA

			RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git

	USER lofar		#USER lofar

	ENV CONTAINER_NAME='ddf2_base3.10'		ENV CONTAINER_NAME='ddf2_base3.10'
			ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'