update docker-compose, requirements, base settings

This commit is contained in:
evgeniy-st 2019-09-06 14:27:14 +03:00
parent cfc2d512ed
commit cfe1c982be
3 changed files with 23 additions and 1 deletions

View File

@ -16,6 +16,20 @@ services:
- db-net - db-net
volumes: volumes:
- gm-db:/var/lib/postgresql/data/ - gm-db:/var/lib/postgresql/data/
elasticsearch:
image: elasticsearch:7.3.1
volumes:
- gm-esdata:/usr/share/elasticsearch/data
hostname: elasticsearch
ports:
- 9200:9200
- 9300:9300
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- discovery.type=single-node
- xpack.security.enabled=false
networks:
- app-net
# RabbitMQ # RabbitMQ
rabbitmq: rabbitmq:
image: rabbitmq:latest image: rabbitmq:latest
@ -87,3 +101,5 @@ volumes:
gm-media: gm-media:
name: gm-media name: gm-media
gm-esdata:

View File

@ -63,6 +63,7 @@ PROJECT_APPS = [
'news.apps.NewsConfig', 'news.apps.NewsConfig',
'notification.apps.NotificationConfig', 'notification.apps.NotificationConfig',
'partner.apps.PartnerConfig', 'partner.apps.PartnerConfig',
'search_indexes.apps.SearchIndexesConfig',
'translation.apps.TranslationConfig', 'translation.apps.TranslationConfig',
'configuration.apps.ConfigurationConfig', 'configuration.apps.ConfigurationConfig',
'timetable.apps.TimetableConfig', 'timetable.apps.TimetableConfig',
@ -85,6 +86,8 @@ EXTERNAL_APPS = [
'rest_framework_simplejwt.token_blacklist', 'rest_framework_simplejwt.token_blacklist',
'solo', 'solo',
'phonenumber_field', 'phonenumber_field',
'django_elasticsearch_dsl',
'django_elasticsearch_dsl_drf',
] ]

View File

@ -29,3 +29,6 @@ django-cors-headers==3.0.2
# JWT # JWT
djangorestframework-simplejwt==4.3.0 djangorestframework-simplejwt==4.3.0
django-elasticsearch-dsl>=7.0.0,<8.0.0
django-elasticsearch-dsl-drf==0.20.2