Skip to content
Snippets Groups Projects
Commit d39b5750 authored by Mattia Mancini's avatar Mattia Mancini
Browse files

Update docker file

parent 0983b837
No related branches found
No related tags found
No related merge requests found
Pipeline #13239 passed with warnings
Stage: validate_cwl_scripts
Stage: test_steps
Show whitespace changes
Inline Side-by-side
Docker/.dockerignore 0 → 100644
+ 7
− 0
View file @ d39b5750
#Aoflagger/.git
casacore/.git
#DP3/.git
Dysco/.git
#idg/.git
LOFARBeam/.git
STMAN/.git
Docker/Dockerfile
+ 102
− 28
View file @ d39b5750
FROM kernsuite/base:5 as builder FROM kernsuite/base:6 as builder
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
gfortran \
flex \
bison \
wcslib-dev \
libncurses5-dev \
casacore-data \ casacore-data \
casacore-dev \ casacore-dev \
libboost-python-dev \ libboost-python-dev \
libcfitsio-dev \ libcfitsio-dev \
python-dev \ python-dev \
python3-numpy \ python3-numpy \
libcasa* \
cmake \ cmake \
build-essential \ build-essential \
liblua5.3-dev \
libhdf5-serial-dev \ libhdf5-serial-dev \
libarmadillo-dev \ libarmadillo-dev \
libboost-filesystem-dev \ libboost-filesystem-dev \
...@@ -21,10 +28,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ...@@ -21,10 +28,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libboost-signals-dev \ libboost-signals-dev \
libboost-program-options-dev \ libboost-program-options-dev \
libboost-test-dev \ libboost-test-dev \
pybind11-dev \
libxml2-dev \ libxml2-dev \
libpng-dev \ libpng-dev \
pkg-config \ pkg-config \
aoflagger-dev \
libgtkmm-3.0-dev \ libgtkmm-3.0-dev \
git \ git \
wget \ wget \
...@@ -35,46 +42,90 @@ RUN mkdir -p /src/ ...@@ -35,46 +42,90 @@ RUN mkdir -p /src/
WORKDIR /src/ WORKDIR /src/
# Build the IDG version from source #ADD ./casacore /src/casacore/src
#RUN cd /src/casacore/ && \
# mkdir build && \
# cd build && \
# cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ \
# -DPYTHON_EXECUTABLE=/usr/bin/python3.6 \
# -DDATA_DIR=/usr/share/casacore/data/ \
# -DUSE_OPENMP=ON \
# -DUSE_HDF5=ON \
# -DBUILD_PYTHON3=ON -DBUILD_PYTHON=OFF\
# -DUSE_THREADS=ON && \
# make -j5 && \
# make install -j5
ADD ./idg /src/idg/src ADD ./STMAN /src/STMAN/src
RUN mkdir idg/build && cd idg/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ ../src && make install -j2 RUN cd /src/STMAN/ && \
ADD ./DP3 /src/dp3/src
RUN cd /src/dp3/ && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \ cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \
make -j2 && \ make -j2 && \
make install -j2 make install -j2
ADD ./STMAN /src/STMAN/src
RUN cd /src/STMAN/ && \ ADD ./Dysco /src/Dysco/src
RUN cd /src/Dysco/ && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \ cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \
make -j2 && \ make -j2 && \
make install -j2 make install -j2
ADD ./Dysco /src/Dysco/src
RUN cd /src/Dysco/ && \ ADD ./idg /src/idg/src
RUN mkdir idg/build && cd idg/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ ../src && make install -j2
ADD ./Aoflagger /src/Aoflagger/src
RUN cd /src/Aoflagger/ && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \ cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPYTHON_EXECUTABLE=/usr/bin/python3.6 && \
make -j2 && \ make -j2 && \
make install -j2 make install -j2
ADD ./LOFARBeam /src/LOFARBeam/src ADD ./LOFARBeam /src/LOFARBeam/src
RUN cd /src/LOFARBeam/ && \ RUN cd /src/LOFARBeam/ && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPYTHON_EXECUTABLE=/usr/bin/python3 && \ cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPYTHON_EXECUTABLE=/usr/bin/python3.6 && \
make -j2 && \
make install -j2
ADD ./Everybeam /src/Everybeam/src
RUN cd /src/Everybeam/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/&& \
make -j2 && \ make -j2 && \
make install -j2 make install -j2
ADD ./DP3 /src/dp3/src
RUN cd /src/dp3/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ \
-DPYTHON_EXECUTABLE=/usr/bin/python3.6 -DPORTABLE=True \
-DAOFlagger_DIR=/usr/local/ &&\
make -j2 && \
make install -j2
COPY ./wsclean/wsclean /src/WSClean/src
RUN cd /src/WSClean/ && \
mkdir build && cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
make -j2 && make install -j2
#---------------------------------------------- #----------------------------------------------
FROM kernsuite/base:5 as runner FROM kernsuite/base:6 as runner
COPY --from=builder /usr/local/ /usr/local COPY --from=builder /usr/local/ /usr/local
...@@ -83,9 +134,12 @@ SHELL ["/bin/bash", "-c"] ...@@ -83,9 +134,12 @@ SHELL ["/bin/bash", "-c"]
RUN export DEBIAN_FRONTEND=noninteractive && \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
aoflagger \
casacore-data \ casacore-data \
wcslib-dev \
libarmadillo8 \ libarmadillo8 \
bison \
libncurses5 \
flex \
libboost-date-time1.65.1 \ libboost-date-time1.65.1 \
libboost-filesystem1.65.1 \ libboost-filesystem1.65.1 \
libboost-numpy1.65.1 \ libboost-numpy1.65.1 \
...@@ -95,9 +149,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ...@@ -95,9 +149,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libboost-signals1.65.1 \ libboost-signals1.65.1 \
libboost-test1.65.1 \ libboost-test1.65.1 \
libboost-python1.65-dev \ libboost-python1.65-dev \
libstationresponse2 \ libstationresponse3 \
liblua5.3-dev \
libcasa-* \ libcasa-* \
pybind11-dev \
libcfitsio5 \ libcfitsio5 \
libcfitsio-dev \
libgtkmm-3.0 \ libgtkmm-3.0 \
libfftw3-3 \ libfftw3-3 \
libhdf5-cpp-100 \ libhdf5-cpp-100 \
...@@ -105,6 +162,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ...@@ -105,6 +162,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2 \ libxml2 \
python3.7 \ python3.7 \
python3-casacore \ python3-casacore \
dysco \
python3-numpy \ python3-numpy \
python3-scipy && \ python3-scipy && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
...@@ -115,6 +173,10 @@ RUN mkdir /home/lofaruser/ && \ ...@@ -115,6 +173,10 @@ RUN mkdir /home/lofaruser/ && \
useradd --no-log-init -r -g lofaruser lofaruser && \ useradd --no-log-init -r -g lofaruser lofaruser && \
chown lofaruser:lofaruser /home/lofaruser chown lofaruser:lofaruser /home/lofaruser
ARG CASACORE_TAG=master
LABEL casacore.version.tag=${CASACORE_TAG}
ARG TOIL_VERSION=3.20.0 ARG TOIL_VERSION=3.20.0
LABEL toil.version=${TOIL_VERSION} LABEL toil.version=${TOIL_VERSION}
...@@ -133,15 +195,32 @@ LABEL Dysco.version.tag=${Dysco_TAG} ...@@ -133,15 +195,32 @@ LABEL Dysco.version.tag=${Dysco_TAG}
ARG LofarBeam_TAG=master ARG LofarBeam_TAG=master
LABEL LOFARBeam.version.tag=${LofarBeam_TAG} LABEL LOFARBeam.version.tag=${LofarBeam_TAG}
RUN apt-get --allow-releaseinfo-change update -y && apt install -y nodejs python3-pip git wsclean ARG DP3_TAG=master
LABEL DP3.version.tag=${DP3_TAG}
ARG IDG_TAG=master
LABEL IDG.version.tag=${IDG_TAG}
ARG Everybeam_TAG
LABEL Everybeam.version.tag=${Everybeam_TAG}
ARG Aoflagger_TAG
LABEL Aoflagger.version.tag=${Aoflagger_TAG}
ARG RMextract_TAG
LABEL RMextract.version.tag=${RMExtract_TAG}
ARG wsclean_TAG
LABEL wsclean.version.tag=${wsclean_TAG}
RUN apt-get --allow-releaseinfo-change update -y && apt install -y nodejs python3-pip git
RUN python3 -m pip install cwltool cwl-runner -e "git://github.com/darafferty/LSMTool.git@${LSMTool_TAG}#egg=LSMTool" \ RUN python3 -m pip install cwltool cwl-runner -e "git://github.com/darafferty/LSMTool.git@${LSMTool_TAG}#egg=LSMTool" \
"toil[cwl]"==${TOIL_VERSION} \ "toil[cwl]"==${TOIL_VERSION} \
matplotlib matplotlib
RUN python3 -m pip install -e "git+https://github.com/revoltek/losoto.git@${LoSoTo_TAG}#egg=LoSoTo" RUN python3 -m pip install -e "git+https://github.com/revoltek/losoto.git@${LoSoTo_TAG}#egg=LoSoTo" ipython \
"git+https://github.com/lofar-astron/RMextract.git@${RMextract_TAG}#egg=RMextract"
ADD losoto.patch /home/lofaruser/losoto.patch
RUN patch /src/losoto/losoto/operations/__init__.py /home/lofaruser/losoto.patch
ADD .entrypoint /home/lofaruser/.entrypoint ADD .entrypoint /home/lofaruser/.entrypoint
RUN chown lofaruser:lofaruser /home/lofaruser/.entrypoint && \ RUN chown lofaruser:lofaruser /home/lofaruser/.entrypoint && \
chmod +rx /home/lofaruser/.entrypoint chmod +rx /home/lofaruser/.entrypoint
...@@ -153,8 +232,3 @@ RUN chmod +rx /usr/local/bin/* ...@@ -153,8 +232,3 @@ RUN chmod +rx /usr/local/bin/*
ENTRYPOINT ["/home/lofaruser/.entrypoint"] ENTRYPOINT ["/home/lofaruser/.entrypoint"]
USER lofaruser USER lofaruser
ENV PYTHONPATH=/usr/local/lib/python3.6/site-packages/ ENV PYTHONPATH=/usr/local/lib/python3.6/site-packages/
ARG DP3_TAG=master
ARG IDG_TAG=master
LABEL IDG.version.tag=${IDG_TAG}
LABEL DP3.version.tag=${DP3_TAG}
Docker/Dockerfile.orig 0 → 100644
+ 277
− 0
View file @ d39b5750
FROM kernsuite/base:5 as builder
SHELL ["/bin/bash", "-c"]
<<<<<<< HEAD
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y \
=======
ARG NPROCS=2
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
casacore-data \
casacore-dev \
libboost-python-dev \
libcfitsio-dev \
python-dev \
python3-numpy \
cmake \
build-essential \
libhdf5-serial-dev \
libarmadillo-dev \
<<<<<<< HEAD
libboost-filesystem-dev \
libboost-system-dev \
libboost-date-time-dev \
libboost-numpy-dev \
libboost-signals-dev \
=======
libboost-date-time-dev \
libboost-filesystem-dev \
libboost-thread-dev \
libboost-system-dev \
libboost-program-options-dev \
libboost-chrono-dev \
libboost-atomic-dev \
libboost-system-dev \
libboost-date-time-dev \
libboost-numpy-dev \
libboost-signals-dev \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
libboost-program-options-dev \
libboost-test-dev \
libxml2-dev \
libpng-dev \
<<<<<<< HEAD
pkg-config \
aoflagger-dev \
=======
lua5.3-dev \
pkg-config \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
libgtkmm-3.0-dev \
git \
wget \
libfftw3-dev \
libgsl-dev
RUN mkdir -p /src/
WORKDIR /src/
# Build the IDG version from source
<<<<<<< HEAD
ADD ./idg /src/idg/src
RUN mkdir idg/build && cd idg/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ ../src && make install -j2
ADD ./DP3 /src/dp3/src
RUN cd /src/dp3/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
make -j2 && \
make install -j2
ADD ./STMAN /src/STMAN/src
=======
COPY ./idg /src/idg/src
RUN mkdir idg/build && cd idg/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ ../src && make install -j$NPROCS
COPY ./STMAN /src/STMAN/src
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
RUN cd /src/STMAN/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \
<<<<<<< HEAD
make -j2 && \
make install -j2
ADD ./Dysco /src/Dysco/src
=======
make -j$NPROCS && \
make install -j$NPROCS
COPY ./Dysco /src/Dysco/src
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
RUN cd /src/Dysco/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True && \
<<<<<<< HEAD
make -j2 && \
make install -j2
ADD ./LOFARBeam /src/LOFARBeam/src
=======
make -j$NPROCS && \
make install -j$NPROCS
COPY ./LOFARBeam /src/LOFARBeam/src
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
RUN cd /src/LOFARBeam/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPYTHON_EXECUTABLE=/usr/bin/python3 && \
<<<<<<< HEAD
make -j2 && \
make install -j2
=======
make -j$NPROCS && \
make install -j$NPROCS
COPY ./aoflagger /src/aoflagger/src
RUN cd /src/aoflagger/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
make -j$NPROCS && \
make install -j$NPROCS
COPY ./DP3 /src/dp3/src
RUN cd /src/dp3/ && \
mkdir build && \
cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
make -j$NPROCS && \
make install -j$NPROCS
COPY ./wsclean/wsclean /src/WSClean/src
RUN cd /src/WSClean/ && \
mkdir build && cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
make -j$NPROCS && make install -j$NPROCS
COPY ./wsclean/chgcentre /src/chgcenter/src
RUN cd /src/chgcenter/ && \
mkdir build && cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
make -j$NPROCS && make install -j$NPROCS
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
#----------------------------------------------
FROM kernsuite/base:5 as runner
COPY --from=builder /usr/local/ /usr/local
SHELL ["/bin/bash", "-c"]
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y \
<<<<<<< HEAD
aoflagger \
casacore-data \
libarmadillo8 \
=======
casacore-data \
libarmadillo8 \
libboost-filesystem1.65.1 \
libboost-thread1.65.1 \
libboost-chrono1.65.1 \
libboost-atomic1.65.1 \
libboost-program-options1.65.1 \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
libboost-date-time1.65.1 \
libboost-filesystem1.65.1 \
libboost-numpy1.65.1 \
libboost-python1.65.1 \
libboost-program-options1.65.1 \
libboost-system1.65.1 \
libboost-signals1.65.1 \
libboost-test1.65.1 \
libboost-python1.65-dev \
libstationresponse2 \
libcasa-* \
libcfitsio5 \
libgtkmm-3.0 \
<<<<<<< HEAD
=======
libgsl23 \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
libfftw3-3 \
libhdf5-cpp-100 \
libpng16-16 \
libxml2 \
<<<<<<< HEAD
=======
lua5.3 \
liblua5.3 \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
python3.7 \
python3-casacore \
python3-numpy \
python3-scipy && \
rm -rf /var/lib/apt/lists/*
RUN mkdir /home/lofaruser/ && \
groupadd -r lofaruser && \
useradd --no-log-init -r -g lofaruser lofaruser && \
chown lofaruser:lofaruser /home/lofaruser
ARG TOIL_VERSION=3.20.0
LABEL toil.version=${TOIL_VERSION}
ARG LSMTool_TAG=master
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}
ARG LofarBeam_TAG=master
LABEL LOFARBeam.version.tag=${LofarBeam_TAG}
<<<<<<< HEAD
RUN apt-get --allow-releaseinfo-change update -y && apt install -y nodejs python3-pip git wsclean
=======
ARG WSClean_TAG=master
LABEL WSClean.version.tag=${WSClean_TAG}
RUN apt-get --allow-releaseinfo-change update -y && apt install -y nodejs python3-pip git
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
RUN python3 -m pip install cwltool cwl-runner -e "git://github.com/darafferty/LSMTool.git@${LSMTool_TAG}#egg=LSMTool" \
"toil[cwl]"==${TOIL_VERSION} \
matplotlib
RUN python3 -m pip install -e "git+https://github.com/revoltek/losoto.git@${LoSoTo_TAG}#egg=LoSoTo"
<<<<<<< HEAD
ADD losoto.patch /home/lofaruser/losoto.patch
RUN patch /src/losoto/losoto/operations/__init__.py /home/lofaruser/losoto.patch
=======
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
ADD .entrypoint /home/lofaruser/.entrypoint
RUN chown lofaruser:lofaruser /home/lofaruser/.entrypoint && \
chmod +rx /home/lofaruser/.entrypoint
WORKDIR /home/lofaruser
RUN chmod +rx /usr/local/bin/*
ENTRYPOINT ["/home/lofaruser/.entrypoint"]
USER lofaruser
ENV PYTHONPATH=/usr/local/lib/python3.6/site-packages/
ARG DP3_TAG=master
ARG IDG_TAG=master
LABEL IDG.version.tag=${IDG_TAG}
LABEL DP3.version.tag=${DP3_TAG}
<<<<<<< HEAD
=======
LABEL AOFLAGGER.version.tag=${AOFLAGGER_TAG}
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
Docker/build_docker.sh
+ 33
− 7
View file @ d39b5750
...@@ -7,38 +7,61 @@ git_clone_or_pull () { ...@@ -7,38 +7,61 @@ git_clone_or_pull () {
DIR=$3 DIR=$3
if [ -d $DIR ] if [ -d $DIR ]
then then
git -C "${DIR}" pull cd ${DIR}
git fetch --all
git checkout ${BRANCH}
cd -
else else
git clone --depth 1 -b "${BRANCH}" "${REPO}" "${DIR}" git clone -b "${BRANCH}" "${REPO}" "${DIR}"
fi fi
} }
# SOFTWARE VERSIONS # SOFTWARE VERSIONS
DP3_TAG=v4.1 DP3_TAG=v5.1
IDG_TAG=0.6 Dysco_TAG=v1.2
Everybeam_TAG=v0.1.2
Aoflagger_TAG=v3.1.0
LofarBeam_TAG=master
IDG_TAG=0.8
LSMTool_TAG=v1.4.2 LSMTool_TAG=v1.4.2
LoSoTo_TAG=f0398b LoSoTo_TAG=master
TOIL_VERSION=3.20.0 TOIL_VERSION=3.20.0
STMAN_TAG=master STMAN_TAG=master
Dysco_TAG=v1.2
Prefactor_TAG=master Prefactor_TAG=master
LofarBeam_TAG=master CASACORE_TAG=v3.4.0
RMextract_TAG=v0.4
wsclean_tag=master
## FETCHES casacore
#git_clone_or_pull https://github.com/casacore/casacore ${CASACORE_TAG} casacore
# FETCHES THE IDG # FETCHES THE IDG
git_clone_or_pull https://gitlab.com/astron-idg/idg/ ${IDG_TAG} idg git_clone_or_pull https://gitlab.com/astron-idg/idg/ ${IDG_TAG} idg
# FETCHES Aoflagger
git_clone_or_pull https://gitlab.com/aroffringa/aoflagger.git ${Aoflagger_TAG} Aoflagger
# FETCHES DP3 # 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 STMAN # FETCHES STMAN
git_clone_or_pull https://github.com/lofar-astron/LofarStMan ${STMAN_TAG} STMAN git_clone_or_pull https://github.com/lofar-astron/LofarStMan ${STMAN_TAG} STMAN
# FETCHES Dysco # FETCHES Dysco
git_clone_or_pull https://github.com/aroffringa/dysco.git ${Dysco_TAG} Dysco git_clone_or_pull https://github.com/aroffringa/dysco.git ${Dysco_TAG} Dysco
# FETCHES Everybeam
git_clone_or_pull https://git.astron.nl/RD/EveryBeam.git ${Everybeam_TAG} Everybeam
# FETCHES LOFARBeam # FETCHES LOFARBeam
git_clone_or_pull https://github.com/lofar-astron/LOFARBeam ${LofarBeam_TAG} LOFARBeam git_clone_or_pull https://github.com/lofar-astron/LOFARBeam ${LofarBeam_TAG} LOFARBeam
# FETCHES WSClean
git_clone_or_pull https://git.code.sf.net/p/wsclean/code ${wsclean_tag} wsclean
SCRIPT_PATH=$(realpath ${BASH_SOURCE[0]}) SCRIPT_PATH=$(realpath ${BASH_SOURCE[0]})
DOCKER_PATH=$(dirname ${SCRIPT_PATH}) DOCKER_PATH=$(dirname ${SCRIPT_PATH})
...@@ -47,10 +70,13 @@ docker build ${DOCKER_PATH} --build-arg=IDG_TAG=${IDG_TAG}\ ...@@ -47,10 +70,13 @@ docker build ${DOCKER_PATH} --build-arg=IDG_TAG=${IDG_TAG}\
--build-arg=DP3_TAG=${DP3_TAG}\ --build-arg=DP3_TAG=${DP3_TAG}\
--build-arg=LSMTool_TAG=${LSMTool_TAG}\ --build-arg=LSMTool_TAG=${LSMTool_TAG}\
--build-arg=LoSoTo_TAG=${LoSoTo_TAG}\ --build-arg=LoSoTo_TAG=${LoSoTo_TAG}\
--build-arg=Everybeam_TAG=${Everybeam_TAG}\
--build-arg=STMAN_TAG=${STMAN_TAG}\ --build-arg=STMAN_TAG=${STMAN_TAG}\
--build-arg=Dysco_TAG=${Dysco_TAG}\ --build-arg=Dysco_TAG=${Dysco_TAG}\
--build-arg=TOIL_VERSION=${TOIL_VERSION}\ --build-arg=TOIL_VERSION=${TOIL_VERSION}\
--build-arg=WSClean_TAG=${wsclean_tag} \
--build-arg=LofarBeam_TAG=${LofarBeam_TAG}\ --build-arg=LofarBeam_TAG=${LofarBeam_TAG}\
--build-arg=RMextract_TAG=${RMextract_TAG} \
-t lofareosc/lofar-pipeline -t lofareosc/lofar-pipeline
docker build ${DOCKER_PATH} -f ${DOCKER_PATH}/Dockerfile_ci -t lofareosc/lofar-pipeline-ci docker build ${DOCKER_PATH} -f ${DOCKER_PATH}/Dockerfile_ci -t lofareosc/lofar-pipeline-ci
Docker/build_docker.sh.orig 0 → 100755
+ 94
− 0
View file @ d39b5750
#! /bin/bash
set -e
git_clone_or_pull () {
REPO=$1
BRANCH=$2
DIR=$3
<<<<<<< HEAD
if [ -d $DIR ]
then
git -C "${DIR}" pull
=======
OLD_DIR=${PWD}
if [ -d $DIR ]
then
cd ${DIR}
git checkout ${BRANCH}
git pull
cd ${OLD_DIR}
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
else
git clone --depth 1 -b "${BRANCH}" "${REPO}" "${DIR}"
fi
}
# SOFTWARE VERSIONS
<<<<<<< HEAD
DP3_TAG=v4.1
IDG_TAG=0.6
LSMTool_TAG=v1.4.2
LoSoTo_TAG=f0398b
=======
AOFLAGGER_TAG=v2.15.0
DP3_TAG=v4.1
IDG_TAG=master
LSMTool_TAG=v1.4.2
LoSoTo_TAG=master
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
TOIL_VERSION=3.20.0
STMAN_TAG=master
Dysco_TAG=v1.2
Prefactor_TAG=master
<<<<<<< HEAD
LofarBeam_TAG=master
=======
LofarBeam_TAG=v4.1.1
wsclean_tag=master
# FETCHES AOFLAGGER
git_clone_or_pull https://git.code.sf.net/p/aoflagger/code ${AOFLAGGER_TAG} aoflagger
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
# 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
# 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 LOFARBeam
git_clone_or_pull https://github.com/lofar-astron/LOFARBeam ${LofarBeam_TAG} LOFARBeam
<<<<<<< HEAD
=======
# FETCHES WSClean
git_clone_or_pull https://git.code.sf.net/p/wsclean/code ${wsclean_tag} wsclean
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
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}\
--build-arg=LoSoTo_TAG=${LoSoTo_TAG}\
--build-arg=STMAN_TAG=${STMAN_TAG}\
--build-arg=Dysco_TAG=${Dysco_TAG}\
--build-arg=TOIL_VERSION=${TOIL_VERSION}\
<<<<<<< HEAD
--build-arg=LofarBeam_TAG=${LofarBeam_TAG}\
=======
--build-arg=LofarBeam_TAG=${LofarBeam_TAG}\
--build-arg=WSClean_TAG=${wsclean_tag} \
--build-arg=NPROCS=10 \
>>>>>>> 17890d3adb24ee36ca090df27f8139dbf5125f81
-t lofareosc/lofar-pipeline
docker build ${DOCKER_PATH} -f ${DOCKER_PATH}/Dockerfile_ci -t lofareosc/lofar-pipeline-ci
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment