Merge branch 'fix_everybeam_version' into 'master'

Fix build by pinning EVERYBEAM_COMMIT=v0.6.1. It requires casacore>v3.6. Since...

See merge request !22

docker/Dockerfile

@@ -35,6 +35,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         libpython3-dev \
         pkg-config \
         python3 \
+        python3-pip \
+        python3-setuptools \
+        python3-wheel \
         python3-casacore \
         python3-numpy \
         wcslib-dev \
@@ -74,7 +77,7 @@ RUN git clone --no-checkout \
     cmake .. -DPORTABLE=${PORTABLE} && \
     make install -j`nproc`
 
-ARG EVERYBEAM_COMMIT=master
+ARG EVERYBEAM_COMMIT=v0.6.1
 RUN git clone --no-checkout \
         https://git.astron.nl/RD/EveryBeam.git && \
     mkdir EveryBeam/build && \
@@ -92,15 +95,6 @@ RUN git clone --no-checkout \
     cmake .. -DPORTABLE=${PORTABLE} -DLIBDIRAC_PREFIX=/usr/local/ && \
     make install -j`nproc`
 
-# RUN git clone --no-checkout https://git.astron.nl/ldv/ldv-images.git /opt
-
-# Do not use `pip` from the Debian repository, but fetch it from PyPA.
-# This way, we are sure that the latest versions of `pip`, `setuptools`, and
-# `wheel` are installed in /usr/local, the only directory we're going to copy
-# over to the next build stage.
-RUN wget https://bootstrap.pypa.io/get-pip.py && \
-    python3 get-pip.py
-
 # Install required python packages
 RUN python3 -m pip install --no-cache-dir --upgrade \
     cwl-runner \
@@ -133,8 +127,8 @@ apt-get install --yes casacore-data \
 
 COPY --from=builder /usr/local /usr/local
 RUN git clone https://git.astron.nl/ldv/ldv-images.git /opt/ldv-images
-RUN git clone https://git.astron.nl/ldv/lofar_quality.git /opt/lofar_quality && \
-    pip install /opt/lofar_quality
+RUN git clone -b export_median_dataloss https://git.astron.nl/ldv/lofar_quality.git /opt/lofar_quality && \
+    python3 -m pip install /opt/lofar_quality
 RUN ln -sf /opt/ldv-images/lofar_legacy/scripts/fixbeaminfo /usr/local/bin/fixbeaminfo
 RUN ln -sf /opt/ldv-images/lofar_legacy/scripts/fixbeaminfo /usr/local/bin/fixinfo
 RUN ln -sf /opt/ldv-images/lofar_legacy/scripts/fix_common_ms_issues.py /usr/local/bin/fix_common_ms_issues.py