3ebc0ad4d3
* Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues
88 lines
1.8 KiB
YAML
88 lines
1.8 KiB
YAML
version: '3'
|
|
services:
|
|
|
|
db:
|
|
restart: always
|
|
image: postgres:9.6-alpine
|
|
networks:
|
|
- internal_network
|
|
### Uncomment to enable DB persistance
|
|
# volumes:
|
|
# - ./postgres:/var/lib/postgresql/data
|
|
|
|
redis:
|
|
restart: always
|
|
image: redis:4.0-alpine
|
|
networks:
|
|
- internal_network
|
|
### Uncomment to enable REDIS persistance
|
|
# volumes:
|
|
# - ./redis:/data
|
|
|
|
# es:
|
|
# restart: always
|
|
# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3
|
|
# environment:
|
|
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
|
# networks:
|
|
# - internal_network
|
|
#### Uncomment to enable ES persistance
|
|
## volumes:
|
|
## - ./elasticsearch:/usr/share/elasticsearch/data
|
|
|
|
web:
|
|
build: .
|
|
image: gargron/mastodon
|
|
restart: always
|
|
env_file: .env.production
|
|
command: bundle exec rails s -p 3000 -b '0.0.0.0'
|
|
networks:
|
|
- external_network
|
|
- internal_network
|
|
ports:
|
|
- "3000:3000"
|
|
depends_on:
|
|
- db
|
|
- redis
|
|
# - es
|
|
volumes:
|
|
- ./public/assets:/mastodon/public/assets
|
|
- ./public/packs:/mastodon/public/packs
|
|
- ./public/system:/mastodon/public/system
|
|
|
|
streaming:
|
|
build: .
|
|
image: gargron/mastodon
|
|
restart: always
|
|
env_file: .env.production
|
|
command: npm run start
|
|
networks:
|
|
- external_network
|
|
- internal_network
|
|
ports:
|
|
- "4000:4000"
|
|
depends_on:
|
|
- db
|
|
- redis
|
|
|
|
sidekiq:
|
|
build: .
|
|
image: gargron/mastodon
|
|
restart: always
|
|
env_file: .env.production
|
|
command: bundle exec sidekiq -q default -q mailers -q pull -q push
|
|
depends_on:
|
|
- db
|
|
- redis
|
|
networks:
|
|
- external_network
|
|
- internal_network
|
|
volumes:
|
|
- ./public/packs:/mastodon/public/packs
|
|
- ./public/system:/mastodon/public/system
|
|
|
|
networks:
|
|
external_network:
|
|
internal_network:
|
|
internal: true
|