simplify db setup

Author: Mario Colombo

.env-local

@@ -1,4 +1,4 @@
-DATABASE_URL=postgres://postgres@database_default:5432/db
+DATABASE_URL=postgres://postgres:password@database_default:5432/db
 DEFAULT_STORAGE_DSN=file:///data/media/?url=%2Fmedia%2F
 DJANGO_DEBUG=True
 DOMAIN_ALIASES=localhost, 127.0.0.1

docker-compose.yml

@@ -20,8 +20,11 @@ services:
   database_default:
     # Select one of the following db configurations for the database
     image: postgres:9.6-alpine
+    ports:
+      - "5432:5432"  # allow your local dev env to connect to the db
     environment:
       POSTGRES_DB: "db"
+      POSTGRES_PASSWORD: "password"
       POSTGRES_HOST_AUTH_METHOD: "trust"
       SERVICE_MANAGER: "fsm-postgres"
     volumes:

quickstart/settings.py

@@ -141,20 +141,7 @@
 # Configure database using DATABASE_URL; fall back to sqlite in memory when no
 # environment variable is available, e.g. during Docker build
 DATABASE_URL = os.environ.get('DATABASE_URL', 'sqlite://:memory:')
-
-if not os.environ.get('CI', False):
-    DATABASES = {'default': dj_database_url.parse(DATABASE_URL)}
-else:
-    DATABASES = {
-        'default': {
-           'ENGINE': 'django.db.backends.postgresql',
-           'NAME': 'postgres',
-           'USER': 'postgres',
-           'PASSWORD': 'postgres',
-           'HOST': '127.0.0.1',
-           'PORT': '5432',
-        }
-    }
+DATABASES = {'default': dj_database_url.parse(DATABASE_URL)}
 
 
 # Password validation