Merge pull request #15 from guydou/allow_setting_username_and_password_from_env

Allow setting username and password from env

Author: mosquito

docker-compose.yml

@@ -23,6 +23,10 @@ services:
       # Database URL. Use `sqlite3:///` or `mysql://` when needed
       DB: "postgres://pypi-server:pypi-server@db/pypi-server"
 
+      ## if you want to set PGUSER and PGPASSWORD in env 
+
+      #PGUSER: pypi-server
+      #PGPASSWORD: pypi-server
       ## By default random
       #SECRET: changeme
 

pypi_server/db/__init__.py

@@ -60,8 +60,8 @@ def init_postgres(url):
 
     DB.initialize(PostgresqlDatabase(
         database=db_name,
-        user=url.user or '',
-        password=url.password or '',
+        user=url.user or None,
+        password=url.password or None,
         host=url.host,
         autocommit=bool(url.get('autocommit', True)),
         autorollback=bool(url.get('autorollback', True))