diff --git a/docker/Dockerfile b/docker/Dockerfile index 27c1d86..5d7d771 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,6 +18,7 @@ RUN chown -R jovyan:users /home/jovyan/.jupyter ENV NOTEBOOK_HOME=/home/jovyan/work/notebooks RUN pip install wget +RUN pip install ulmo ################################################### ## End - JupyterHub Development Image Additions ### diff --git a/install/install-services.sh b/install/install-services.sh index 1b5e2b5..9dd0553 100755 --- a/install/install-services.sh +++ b/install/install-services.sh @@ -15,9 +15,9 @@ PWD=$( dirname $( readlink -f ${BASH_SOURCE[0]} ) ) # Install Environment File (Base Dir) # ####################################### -echo "--> installing jupyterhub common files" -JH=/etc/jupyterhub -mkdir -p $JH +#echo "--> installing jupyterhub common files" +#JH=/etc/jupyterhub +#mkdir -p $JH # jupyterhub server dir echo "----> moving jupyterhub env and static files" @@ -41,6 +41,11 @@ echo "----> preparing jupyterhub culling" JHC=/etc/jupyterhub/cull mkdir -p $JHC +# log dir +echo "----> preparing jupyterhub logging" +JHL=/etc/jupyterhub/log +mkdir -p $JHL + ####################################### # Install Jupyterhub Server # ####################################### diff --git a/jpctl.sh b/jpctl.sh index a6f5a2e..2f3c130 100755 --- a/jpctl.sh +++ b/jpctl.sh @@ -101,14 +101,23 @@ install_base_rhel() { # install jupyterhub dependencies echo -e "--> installing system requirements" sudo yum clean all - sudo yum update - sudo yum install -y openssh-server wget screen docker python3-dateutil, tree + sudo yum install -y openssh-server wget screen docker tree gcc-c++ make + + if ( ! which python3 ); then + sudo rpm -Uvh https://centos7.iuscommunity.org/ius-release.rpm || true + sudo yum install -y python35u python35u-libs python35u-devel python35u-pip + sudo ln -sf /usr/bin/python3.5 /usr/bin/python3 + sudo ln -sf /usr/bin/pip3.5 /usr/bin/pip3 + fi + sudo pip3 install python-dateutil + + # install epel + sudo yum install -y epel-release # install node and configurable proxy echo -e "--> installing nodejs and configurable-http-proxy" - sudo yum -y install nodejs + sudo yum install -y nodejs sudo npm install -g configurable-http-proxy - sudo yum install -y gcc-c++ make } install() { @@ -129,8 +138,8 @@ install() { fi # activate and enable docker - sudo systemctl start docker sudo systemctl enable docker + sudo systemctl start docker # install pip, ipgetter, and jupyterhub echo -e "--> installing pip3, ipgetter, jupyterHub"