artisan subtype fix

This commit is contained in:
alex 2019-11-28 09:19:53 +03:00
parent 78d4145336
commit 749c4a637b
3 changed files with 1 additions and 116 deletions

View File

@ -39,7 +39,7 @@ class Command(BaseCommand):
index_name=tag, index_name=tag,
defaults={ defaults={
'index_name': tag, 'index_name': tag,
'name': {'en-GB': tag}, 'name': {'en-GB': ' '.join(tag.split('_')).capitalize()},
'establishment_type': es_type, 'establishment_type': es_type,
} }
) )

View File

@ -1,106 +0,0 @@
version: '3.5'
services:
# Legacy MySQL DB
mysql_db:
image: mysql:5.7
ports:
- "3306:3306"
environment:
MYSQL_DATABASE: dev
MYSQL_USER: dev
MYSQL_PASSWORD: octosecret123
MYSQL_ROOT_PASSWORD: rootPassword
volumes:
- gm-mysql_db:/var/lib/mysql
# PostgreSQL database
db:
build:
context: ./_dockerfiles/db
dockerfile: Dockerfile
hostname: db
env_file:
- env
ports:
- "5436:5432"
volumes:
- gm-db:/var/lib/postgresql/data/
- ./local_files/dump_alex.sql:/dump_alex.sql
# - ./local_files/docker-entrypoint.sh:/docker-entrypoint-initdb.d/docker-entrypoint.sh
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
# Redis
redis:
image: redis:alpine
# Celery
worker:
build: .
command: ./run_celery.sh
env_file:
- env
volumes:
- .:/code
links:
- db
- redis
worker_beat:
build: .
command: ./run_celery_beat.sh
env_file:
- env
volumes:
- .:/code
links:
- db
- redis
# App: G&M
gm_app:
build: .
command: python manage.py runserver 0.0.0.0:8000
env_file:
- env
depends_on:
- mysql_db
- db
- redis
- worker
- worker_beat
- elasticsearch
volumes:
- .:/code
- gm-media:/media-data
ports:
- "8000:8000"
volumes:
gm-mysql_db:
name: gm-mysql_db
gm-db:
name: gm-db
gm-media:
name: gm-media
gm-esdata:

9
env
View File

@ -1,9 +0,0 @@
SETTINGS_CONFIGURATION=local
DB_NAME=gm
DB_USERNAME=gm
DB_HOSTNAME=db
DB_PORT=5432
DB_PASSWORD=gm
POSTGRES_USER=gm
POSTGRES_PASSWORD=gm
POSTGRES_DB=gm