old wdf version

vre-hub · Feb 12, 2024 · a23240e · a23240e
1 parent 0492873
commit a23240e
Showing 1 changed file with 64 additions and 43 deletions.
diff --git a/vre-singleuser-py311/Dockerfile b/vre-singleuser-py311/Dockerfile
@@ -60,57 +60,78 @@ ENV JUPYTER_ENABLE_LAB=yes
 
 ## HARDCODING ENVIRONMENT VARIABLES
 ## not using venv, instead we use the base conda env and fixing env vars
-#ENV LD_LIBRARY_PATH="/opt/conda/lib:$LD_LIBRARY_PATH"
-#ENV PYTHONPATH="/opt/conda/lib/python3.11:/opt/conda/lib/python3.11/site-packages:$PYTHONPATH"
+ENV LD_LIBRARY_PATH="/opt/conda/lib:$LD_LIBRARY_PATH"
+ENV PYTHONPATH="/opt/conda/lib/python3.11:/opt/conda/lib/python3.11/site-packages:$PYTHONPATH"
 
 ## While the installation of pst4 and the use of `venv`, it is needed the `ENV_ROOT` env var
 ## > echo $ENV_ROOT/
 ## > /opt/venv/
-#ENV ENV_ROOT="/opt/conda"
+ENV ENV_ROOT="/opt/conda"
 
 COPY requirements.txt .  
-RUN pip3 install -r requirements.txt
-
-# ## Install WDF dependancies
-# RUN set -eux; \
-# 	apt-get update; \
-# 	apt-get install -y --no-install-recommends \
-# 	cmake \
-#     libboost-all-dev \
-#     pybind11-dev python3-pybind11 \
-#     libfftw3-3 libfftw3-dev libfftw3-bin \
-#     libgsl-dev; \
-# 	rm -rf /var/lib/apt/lists/*
-
-# #install FrameLib
-# RUN set -ex \
-#     && git clone https://git.ligo.org/virgo/virgoapp/Fr.git \
-#     && cd  Fr && cmake CMakeLists.txt \
-#     && make -j "$(nproc)" \
-#     && make install \
-#     && cd .. \
-#     && rm -rf Fr  
-
-# #install P4TSA
-# RUN git clone https://github.com/elenacuoco/p4TSA && cd p4TSA && cmake CMakeLists.txt \
-#     && make -j "$(nproc)" \
-#     && make install \
-#     && cd python-wrapper \
-#     && python setup.py  install \
-#     && cd .. \
-#     && cd .. \
-#     && rm -fr p4TSA
-
-# RUN /sbin/ldconfig 
-
-# #install wdpipe
-# # Second line to be deleted when fixed in the wdfpipe repo 
-# RUN git clone https://gitlab.com/wdfpipe/wdf.git && cd wdf \
-#     && python setup.py  install \
-#     && cd .. \ 
-#     && rm -fr wdf
+# Using installed version of pip
+RUN echo "pip:"; pip -V && \
+    echo "pip3:" pip3 -V
+RUN pip3 install --no-cache-dir wheel
+RUN pip3 install --no-cache-dir -r requirements.txt
+
+
+# ------------------------------------------------------
+# Env wdf
+# 05-10-2022 https://gitlab.com/wdfpipe/wdf/-/blob/master/dockers/env_wdf/Dockerfile
+
+#install GSL 
+RUN set -ex \
+    && wget https://mirror.ibcp.fr/pub/gnu/gsl/gsl-2.7.1.tar.gz\
+    && tar -xzf gsl-2.7.1.tar.gz \
+    && cd gsl-2.7.1\
+    && ./configure \
+    && make -j "$(nproc)" \
+    && make install \
+    && cd .. \
+    && rm -rf gsl-2.7.1 \
+    && rm gsl-2.7.1.tar.gz
+#RUN apt-get update && apt-get install -y \
+#    libgsl-dev  \
+#    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+
+#install FrameLib
+RUN set -ex \
+    && git clone https://git.ligo.org/virgo/virgoapp/Fr.git \
+    && cd  Fr && cmake CMakeLists.txt \
+    && make -j "$(nproc)" \
+    && make install \
+    && cd .. \
+    && rm -rf Fr  
+
+#install P4TSA
+RUN git clone https://github.com/elenacuoco/p4TSA && cd p4TSA && cmake CMakeLists.txt \
+    && make -j "$(nproc)" \
+    && make install \
+    && cd python-wrapper \
+    && python setup.py  install \
+    && cd .. \
+    && cd .. \
+    && rm -fr p4TSA
+
+RUN /sbin/ldconfig 
+
+
+# ------------------------------------------------------
+# wdpipe
+# 05-10-2022 https://gitlab.com/wdfpipe/wdf/-/blob/master/dockers/wdfpipe/Dockerfile
+
+#install wdpipe
+# Second line to be deleted when fixed in the wdfpipe repo 
+RUN git clone https://gitlab.com/wdfpipe/wdf.git && cd wdf \
+    && python setup.py  install \
+    && cd .. \ 
+    && rm -fr wdf
+
 
 WORKDIR $HOME
 USER $NB_UID
 
+
 CMD ["start-notebook.sh"]