Merge branch '77/dev/beta_1.0/docker'

README.md

@@ -115,6 +115,8 @@ You'll need to install the following packages on your Operating System:
 
     apt-get install git realpath python3 python-virtualenv python3-dev python-pip build-essential libxml2-dev libxslt1-dev python-lxml
 
+You also need `redis-server` package if you want to send email in async mode.
+
 ## Database ##
 
 If you want use PostgreSQL as database engine:

tracim/test.ini

@@ -22,7 +22,7 @@ host = 127.0.0.1
 port = 8080
 
 [app:main]
-sqlalchemy.url = sqlite:///tracim_test.sqlite
+sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
 use = config:development.ini
 
 [app:main_without_authn]
@@ -30,7 +30,7 @@ use = main
 skip_authentication = True
 
 [app:ldap]
-sqlalchemy.url = sqlite:///tracim_test.sqlite
+sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
 auth_type = ldap
 ldap_url = ldap://localhost:3333
 ldap_base_dn = dc=directory,dc=fsf,dc=org
@@ -49,7 +49,7 @@ resetpassword.smtp_passwd =  fake
 use = config:development.ini
 
 [app:radicale]
-sqlalchemy.url = sqlite:///tracim_test.sqlite
+sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
 
 use = config:development.ini