diff --git a/docker/dask/Dockerfile b/docker/dask/Dockerfile index e6231ef9..1473f2e4 100644 --- a/docker/dask/Dockerfile +++ b/docker/dask/Dockerfile @@ -7,101 +7,6 @@ ENV LC_ALL en_US.UTF-8 RUN localedef -i en_US -c -f UTF-8 en_US.UTF-8 -RUN yum update -y -RUN yum install -y centos-release-scl -RUN yum install -y sqlite-devel \ - autoconf \ - automake \ - binutils \ - bzip2-devel \ - cfitsio-devel \ - clang \ - clang-devel \ -# cmake \ # Too old: 2.8 | min required 3.9 - # Install gcc7 with devtoolset-7 - chromium \ - devtoolset-7 \ - emacs \ - fftw3-devel \ - gcc \ - gcc-c++ \ - gcc-gfortran \ - git \ - graphviz-devel \ - giflib-devel \ - gsl-devel \ - glew-devel \ - libtiff-devel \ - libjpeg-devel \ - libpng-devel \ - libSM-devel \ - libX11-devel \ - libXdmcp-devel \ - libXext-devel \ - libXft-devel \ - libXpm-devel \ - libXrender-devel \ - libXt-devel \ - libxml2-devel \ - make \ - mesa-libGL-devel \ - ncurses-devel \ - openssl-devel \ - patch \ - perl \ - pcre-devel \ - perl-ExtUtils-MakeMaker \ - python3 \ - python3-devel \ - python3-pip \ - python3-numpy \ - readline-devel \ - sqlite-devel \ - sudo \ - tar \ - vim \ - wget \ - which \ - xorg-x11-server-devel \ - zlib-devel && \ - yum clean all && \ - rm -rf /var/cache/yum - -# Install cmake -WORKDIR /usr/local/share - -RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1.tar.gz && \ - tar xzvf cmake-3.21.1.tar.gz && cd cmake-3.21.1 && \ - ./bootstrap && make && make install - -# Install vdt -RUN git clone https://github.com/dpiparo/vdt.git && cd vdt \ - && cmake . && make && make install - -# Install root6 with dask -RUN mkdir root6build root6 -RUN git clone --branch distrdf-dask https://github.com/vepadulano/root.git root6source - -WORKDIR /usr/local/share/root6source - -WORKDIR /usr/local/share/root6build - -# Use root compiler -# RUN cmake \ -# -DCMAKE_INSTALL_PREFIX=/usr/local/share/root6 \ -# -DPython3_EXECUTABLE=/usr/bin/python3 /usr/local/share/root6source - -# Use devtoolset-7 compiler -RUN cmake \ - -DCMAKE_C_COMPILER=/opt/rh/devtoolset-7/root/usr/bin/gcc \ - -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-7/root/usr/bin/g++ \ - -DCMAKE_INSTALL_PREFIX=/usr/local/share/root6 \ - -DPython3_EXECUTABLE=/usr/bin/python3 \ - /usr/local/share/root6source -# Compile root -RUN cmake --build . --target install -- -j8 - -ENV PYTHONPATH=/usr/local/share/root6/lib WORKDIR /usr/local/share @@ -113,23 +18,6 @@ RUN yum update -y && \ rm -rf /var/cache/yum RUN npm install -g configurable-http-proxy -# Dask and jupyterhub -RUN python3 -m pip install --upgrade pip -RUN python3 -m pip install --upgrade setuptools -RUN python3 -m pip install dask \ - dask_jobqueue \ - click==7.1.2 \ - numpy \ - bokeh \ - ipython \ - jupyterhub \ - jupyterlab \ - notebook \ - jupyter-server-proxy \ - ipywidgets -RUN python3 -m pip install "dask[dataframe]" -RUN rm -r /root/.cache - # Install oidc-agent RUN yum update -y && \ yum install -y jq \ @@ -183,17 +71,6 @@ WORKDIR /root COPY htc.rc . -# Install DASK jobqueue -RUN pip3 install dask-remote-jobqueue==v0.4.8 - -# Old approach -# RUN python3 -m pip install dask-labextension "dask[dataframe]" -# COPY labextension.yaml /usr/local/lib/python3.6/site-packages/dask_labextension/labextension.yaml -RUN python3 -m pip install jupyter-packaging \ - && git clone --branch custom_clusters https://github.com/DODAS-TS/dask-labextension.git \ - && cd dask-labextension \ - && python3 -m pip install . - COPY spawn.sh /.init/spawn.sh RUN chmod +x /.init/spawn.sh diff --git a/docker/dask/htc.rc b/docker/dask/htc.rc index bb6c66ae..2e32f136 100644 --- a/docker/dask/htc.rc +++ b/docker/dask/htc.rc @@ -1,9 +1,9 @@ #!/bin/bash export _condor_AUTH_SSL_CLIENT_CAFILE=$HOME/.ca.crt -export _condor_COLLECTOR_HOST=90.147.75.109.myip.cloud.infn.it:30618 -export _condor_SCHEDD_HOST=90.147.75.109.myip.cloud.infn.it -export _condor_SCHEDD_NAME=90.147.75.109.myip.cloud.infn.it +#export _condor_COLLECTOR_HOST=90.147.75.109.myip.cloud.infn.it:30618 +#export _condor_SCHEDD_HOST=90.147.75.109.myip.cloud.infn.it +#export _condor_SCHEDD_NAME=90.147.75.109.myip.cloud.infn.it export _condor_SEC_DEFAULT_ENCRYPTION=REQUIRED export _condor_SEC_CLIENT_AUTHENTICATION_METHODS=SCITOKENS export _condor_SCITOKENS_FILE=$HOME/.token diff --git a/docker/dask/spawn.sh b/docker/dask/spawn.sh index fda810b2..04c55e3d 100755 --- a/docker/dask/spawn.sh +++ b/docker/dask/spawn.sh @@ -17,4 +17,7 @@ while true; do sleep 600 done & +. /cvmfs/cms.dodas.infn.it/miniconda3/etc/profile.d/conda.sh +export LD_LIBRARY_PATH=/cvmfs/cms.dodas.infn.it/miniconda3/envs/cms-dodas/lib/:$LD_LIBRARY_PATH +conda activate cms-dodas source ~/htc.rc