Skip to content
Snippets Groups Projects
Commit 84430c06 authored by Studer Gabriel's avatar Studer Gabriel
Browse files

don't use virtualenv to make container simpler

parent 19b45180
No related branches found
No related tags found
No related merge requests found
...@@ -15,15 +15,7 @@ ln -sf /bin/bash /bin/sh ...@@ -15,15 +15,7 @@ ln -sf /bin/bash /bin/sh
# INSTALL SYSTEM DEPS # INSTALL SYSTEM DEPS
##################### #####################
apt-get update -y && apt-get install -y python3-pip \ apt-get update -y && apt-get install -y python3-pip
python3-venv
# SET UP VIRTUALENV
###################
export VIRTUALENV_DIR="/usr/local/share/ost_venv"
python3 -m venv --system-site-packages $VIRTUALENV_DIR
. $VIRTUALENV_DIR/bin/activate
pip3 install nglview \ pip3 install nglview \
ipython \ ipython \
jupyter jupyter
...@@ -71,7 +63,6 @@ export IPYTHONDIR="/usr/local/share/ipython" ...@@ -71,7 +63,6 @@ export IPYTHONDIR="/usr/local/share/ipython"
export JUPYTER_CONFIG_DIR="/usr/local/etc/jupyter" export JUPYTER_CONFIG_DIR="/usr/local/etc/jupyter"
export JUPYTER_PATH="/usr/local/share/jupyter" export JUPYTER_PATH="/usr/local/share/jupyter"
export JUPYTER_RUNTIME_DIR="/usr/local/share/jupyter/runtime" export JUPYTER_RUNTIME_DIR="/usr/local/share/jupyter/runtime"
export VIRTUALENV_DIR="/usr/local/share/ost_venv"
%apprun ChemdictTool %apprun ChemdictTool
...@@ -181,7 +172,7 @@ export DNG_INITDIR=${DNG_ROOT}/lib64/python3.6/site-packages/ost ...@@ -181,7 +172,7 @@ export DNG_INITDIR=${DNG_ROOT}/lib64/python3.6/site-packages/ost
############################################################################## ##############################################################################
# OST IPYTON APP # OST IPYTON APP
############################################################################## ##############################################################################
. $VIRTUALENV_DIR/bin/activate && ipython3 -i $DNG_INITDIR/ost_startup.py "$@" ipython3 -i $DNG_INITDIR/ost_startup.py "$@"
%apphelp IPython %apphelp IPython
OST-powered iPython shell. OST-powered iPython shell.
...@@ -208,7 +199,7 @@ export XDG_RUNTIME_DIR="" ...@@ -208,7 +199,7 @@ export XDG_RUNTIME_DIR=""
############################################################################## ##############################################################################
# NOTEBOOK APP # NOTEBOOK APP
############################################################################## ##############################################################################
. $VIRTUALENV_DIR/bin/activate && jupyter notebook --NotebookApp.iopub_data_rate_limit=10000000 --no-browser "$@" jupyter notebook --NotebookApp.iopub_data_rate_limit=10000000 --no-browser "$@"
%apphelp Notebook %apphelp Notebook
A Jupyter notebook playground with OST and nglview. A Jupyter notebook playground with OST and nglview.
...@@ -235,8 +226,6 @@ For more details on how to use nglview see http://nglviewer.org/nglview/latest/. ...@@ -235,8 +226,6 @@ For more details on how to use nglview see http://nglviewer.org/nglview/latest/.
As the Singularity mounts $HOME by default Jupyter and Ipython config files As the Singularity mounts $HOME by default Jupyter and Ipython config files
are moved to separate directories. Proper environmental variables are also set. are moved to separate directories. Proper environmental variables are also set.
In addition, Jupyter is run in a separate virtualenv to not interact with
possibly installed host version.
To list of all available options: To list of all available options:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment