Skip to content

Commit 150243f

Browse files
committed
use database url for docker
1 parent 8c5c411 commit 150243f

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

docker-compose.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ version: '3'
33
services:
44
db:
55
restart: always
6-
image: mdillon/postgis:9.3-alpine
6+
image: mdillon/postgis:9.6-alpine
77
volumes:
88
- ./pgdata:/var/lib/postgresql/data
99
expose:
1010
- "5432"
1111
app:
12-
env_file: .env
12+
environment:
13+
DATABASE_URL: postgis://postgres@db:5432/postgres
1314
build:
1415
context: .
1516
dockerfile: ./compose/django/Dockerfile

eatsmart/settings/docker.py

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
from eatsmart.settings.dev import * # noqa
22

3-
# Override settings here
4-
DATABASES = {
5-
'default': {
6-
'ENGINE': 'django.contrib.gis.db.backends.postgis',
7-
'NAME': 'postgres',
8-
'USER': 'postgres',
9-
'HOST': 'db',
10-
'PORT': 5432,
11-
}
12-
}
3+
import dj_database_url
4+
5+
DATABASES['default'].update(dj_database_url.config())

requirements/base.txt

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ BeautifulSoup4==4.4.0
1515
django-leaflet==0.18.1
1616
requests==2.2.1
1717
whitenoise==3.3.0
18+
dj-database-url==0.4.2

requirements/production.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
-r base.txt
22
python3-memcached==1.51
3-
dj-database-url==0.4.2
43
gunicorn==19.7.1

0 commit comments

Comments
 (0)