From 07dab5fa2a4c35dca9a05869de4d6eaa1258996b Mon Sep 17 00:00:00 2001
From: "fabio.vitello" <fabio.vitello@inaf.it>
Date: Fri, 24 Apr 2020 16:52:18 +0200
Subject: [PATCH] ddf2 container
---
ddf2/Dockerfile | 6 ++++++
ddf2/build_docker_container.sh | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile
index c19a142..068d9d9 100644
--- a/ddf2/Dockerfile
+++ b/ddf2/Dockerfile
@@ -27,7 +27,13 @@ RUN cd /opt/DynSpecMS && git checkout 461183f
# DDFacet
COPY DDFacet /opt/DDFacet
RUN cp /opt/ddf-pipeline/misc/setup.cfg /opt/DDFacet/ # Fix compile options
+
+RUN pip install -U pip setuptools wheel
+RUN python -m pip install 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 sed -e "s|INSTALLDIR|/opt|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh
diff --git a/ddf2/build_docker_container.sh b/ddf2/build_docker_container.sh
index 1a3f7be..7c8ffc5 100755
--- a/ddf2/build_docker_container.sh
+++ b/ddf2/build_docker_container.sh
@@ -1,6 +1,8 @@
#!/bin/bash
set -e
rm -rf DDFacet
+
git clone https://github.com/cyriltasse/DDFacet.git
-# git checkout {version hash}
-docker build . -t lofarit/ddf2_base3.10
+git checkout 1059028
+
+docker build . -t lofarit/ddf2_base3.10
--
GitLab