Merge pull request #490 from kvch/gh-pages

update & fix install guide after install refactor

docs/dev/install/installation.rst

@@ -8,6 +8,9 @@ Source: https://about.okhin.fr/posts/Searx/ with some additions
 How to: `Setup searx in a couple of hours with a free SSL
 certificate <https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/>`__
 
+.. contents::
+   :depth: 3
+
 Basic installation
 ------------------
 
@@ -36,8 +39,7 @@ Install dependencies in a virtualenv :
     cd /usr/local/searx
     virtualenv searx-ve
     . ./searx-ve/bin/activate
-    pip install -r requirements.txt
+    ./manage.sh update_packages
-    python setup.py install
 
 Configuration
 -------------
@@ -159,7 +161,7 @@ Restart service :
     sudo service uwsgi restart
 
 from subdirectory URL (/searx)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+""""""""""""""""""""""""""""""
 
 Add this configuration in the server config file
 /etc/nginx/sites-available/default:
@@ -210,7 +212,7 @@ Restart service :
     sudo service nginx restart
 
 with apache
------------
+^^^^^^^^^^^
 
 Add wsgi mod:
 
@@ -240,7 +242,7 @@ Restart Apache :
     sudo /etc/init.d/apache2 restart
 
 disable logs
-------------
+""""""""""""
 
 For better privacy you can disable Apache logs.
 
@@ -272,6 +274,27 @@ How to update
     git stash
     git pull origin master
     git stash apply
-    pip install --upgrade -r requirements.txt
+    ./manage.sh update_packages
     sudo service uwsgi restart
 
+Docker
+------
+
+Make sure you have installed Docker. For instance, you can deploy searx like this:
+
+.. code:: sh
+
+    docker pull wonderfall/searx
+    docker run -d --name searx -p $PORT:8888 wonderfall/searx
+
+Go to http://localhost:$PORT.
+
+See https://hub.docker.com/r/wonderfall/searx/ for more informations.
+
+It's also possible to build searx from the embedded Dockerfile.
+
+.. code:: sh
+
+    git clone https://github.com/asciimoo/searx.git
+    cd searx
+    docker build -t whatever/searx .