diff --git a/apps/establishment/management/commands/add_artisan_subtype.py b/apps/establishment/management/commands/add_artisan_subtype.py index ac93d81f..f7283f4f 100644 --- a/apps/establishment/management/commands/add_artisan_subtype.py +++ b/apps/establishment/management/commands/add_artisan_subtype.py @@ -39,7 +39,7 @@ class Command(BaseCommand): index_name=tag, defaults={ 'index_name': tag, - 'name': {'en-GB': tag}, + 'name': {'en-GB': ' '.join(tag.split('_')).capitalize()}, 'establishment_type': es_type, } ) diff --git a/docker-compose.local.yml b/docker-compose.local.yml deleted file mode 100644 index 1a2d9236..00000000 --- a/docker-compose.local.yml +++ /dev/null @@ -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: - diff --git a/env b/env deleted file mode 100644 index 67e9f44f..00000000 --- a/env +++ /dev/null @@ -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 \ No newline at end of file