From ec8b643c54e09675a56d5191fbdcdc16f70d13c0 Mon Sep 17 00:00:00 2001 From: littlewolf Date: Mon, 2 Dec 2019 15:28:39 +0300 Subject: [PATCH] Fix db to dump --- _dockerfiles/db/Dockerfile | 2 +- docker-compose.mysql.yml | 1 + project/settings/base.py | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/_dockerfiles/db/Dockerfile b/_dockerfiles/db/Dockerfile index 45c707d9..e8a9ded3 100644 --- a/_dockerfiles/db/Dockerfile +++ b/_dockerfiles/db/Dockerfile @@ -1,3 +1,3 @@ -FROM mdillon/postgis:9.5 +FROM mdillon/postgis:latest RUN localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8 ENV LANG ru_RU.utf8 diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 1931410a..b7af676b 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -29,6 +29,7 @@ services: - "5436:5432" volumes: - gm-db:/var/lib/postgresql/data/ + - .:/code elasticsearch: diff --git a/project/settings/base.py b/project/settings/base.py index 80c2af97..2ae87a0b 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -155,6 +155,9 @@ DATABASES = { 'PASSWORD': os.environ.get('DB_PASSWORD'), 'HOST': os.environ.get('DB_HOSTNAME'), 'PORT': os.environ.get('DB_PORT'), + 'OPTIONS': { + 'options': '-c search_path=gm' + }, }, }