Fix notebook startup and doc (fix #105), fix DB waiting script, use mysql:5

Author: yomguy

app/bin/app.sh

@@ -3,10 +3,16 @@
 SCRIPT_DIR="$(dirname "$0")"
 source "$SCRIPT_DIR/app_base.sh"
 
-# django init
+# waiting for other network services
+sh $app/bin/wait.sh
 python $manage wait-for-db
-python $manage migrate --noinput
-python $manage bower_install -- --allow-root
+
+# django init
+if [ ! -f .init ]; then
+    python $manage migrate --noinput
+    python $manage bower_install -- --allow-root
+    touch .init
+fi
 
 # timeside setup
 python $manage timeside-create-admin-user

app/bin/wait.sh

@@ -1,16 +1,18 @@
 #!/bin/bash
 
+# apt-get install -y --force-yes netcat
+
 set -e
 
 host=$(env | grep _TCP_ADDR | cut -d = -f 2)
 port=$(env | grep _TCP_PORT | cut -d = -f 2)
 
-if [ -n "${host:1}" ]; then
-    echo -n "waiting for TCP connection to $host:$port..."
-    while ! nc -w 1 $host $port 2>/dev/null
-    do
-	echo -n .
-	sleep 1
-    done
-fi
+echo -n "waiting for TCP connection to $host:$port..."
+
+while ! nc -w 1 $host $port 2>/dev/null
+do
+  echo -n .
+  sleep 1
+done
+
 echo 'ok'

docker-compose.yml

@@ -34,7 +34,7 @@ var:
   command: "true"
 
 db:
-  image: mysql
+  image: mysql:5
   volumes:
     - ./var/lib/mysql:/var/lib/mysql
   volumes_from:

docs/source/ui.rst

@@ -2,52 +2,33 @@
 User Interfaces
 ===============
 
-Linux
------
+Ipython
+-------
 
-To run the python shell, just do it through the docker composition::
+To run the ipython shell, just do it through the docker composition::
 
     docker-compose run app ipython
 
-
-MacOS or Windows
-----------------
-
-Same as in Linux, but you need to create a docker machine first::
-
-    docker-machine create --driver virtualbox --virtualbox-memory 8096 timeside
-    eval "$(docker-machine env timeside)"
-    docker-compose run app ipython
-
-More infos about the TimeSide docker image: https://registry.hub.docker.com/u/parisson/timeside/
-
-
 Notebook
 ---------
 
 You can also run your code in the wonderful `Jupyter Notebook <http://jupyter.org/>`_ which gives you a web interface to run your own code and share the results with your collaborators::
 
-    docker-compose -f docker-compose.yml -f conf/dev.yml run --service-ports notebook
-
-and then browse  http://localhost:8888 to acces the Jupyter notebook interface.
-
-On MacOS or Windows, you will need to ask the IP of the virtual machine to docker-machine::
-
-    docker-machine ip timeside
+    docker-compose -f docker-compose.yml -f conf/notebook.yml up
 
-If it gives you for example 192.168.59.103, you should be able to browse the notebook at http://192.168.59.103:8888/
+and then browse  http://localhost:8888 to access the Jupyter notebook interface. Use the token given in the docker logs of the `notebook` container to login.
 
 .. warning :: Running a Jupyter notebook server with this setup in a non-secured network is not safe. See `Running a notebook server <http://jupyter-notebook.readthedocs.org/en/latest/public_server.html/>`_ for a documented solution to this security problem.
 
 
 Use you own data
 ----------------
 
-The var/media directory is mounted in /srv/media in the container so you can use it to exchange data between the host and the app container.
+The `var/media` directory is mounted in `/srv/media` inside the container so you can use it to exchange data between the host and the app container.
 
 
-Web Server (experimental)
--------------------------
+Web Server
+----------
 
 TimeSide now includes an experimental web service with a REST API::
 

env/notebook.yml

@@ -28,4 +28,4 @@ notebook:
     - "8888:8888"
   volumes_from:
     - app
-  command: sh -c "cd /srv/src/timeside/docs/ipynb; jupyter notebook --no-browser --ip=0.0.0.0"
+  command: sh -c "cd /srv/lib/timeside/docs/ipynb; jupyter notebook --no-browser --ip=0.0.0.0 --allow-root"