Skip to content

feat: add meilisearch container for v2 libraries in cms #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: add meilisearch container for v2 libraries in cms #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"27017": { "label": "mongo" },
"9201": { "label": "elasticsearch710" },
"9301": { "label": "elasticsearch710" },
"7700": { "label": "meilisearch184" },
"9202": { "label": "opensearch12" },
"9600": { "label": "opensearch12" },
"8081": { "label": "schema-registry" },
Expand Down
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,19 @@ dev.provision.%: dev.check-memory ## Provision specified services.
echo $*
bash ./provision.sh $*

dev.backup: dev.up.mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Write all data volumes to the host.
dev.backup: dev.up.mysql80+mongo+elasticsearch710+meilisearch184+opensearch12+coursegraph ## Write all data volumes to the host.
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql80) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql80.tar.gz /var/lib/mysql
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mongo) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mongo.tar.gz /data/db
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch710) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/elasticsearch710.tar.gz /usr/share/elasticsearch/data
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.meilisearch184) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/meilisearch184.tar.gz /usr/share/elasticsearch/data
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.opensearch12) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/opensearch12.tar.gz /usr/share/opensearch/data
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.coursegraph) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/coursegraph.tar.gz /data

dev.restore: dev.up.mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
dev.restore: dev.up.mysql80+mongo+elasticsearch710+meilisearch184+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mysql80) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mysql80.tar.gz
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.mongo) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mongo.tar.gz
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.elasticsearch710) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch710.tar.gz
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.meilisearch184) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/meilisearch184.tar.gz
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.opensearch12) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/opensearch12.tar.gz
docker run --rm --volumes-from $$(make --silent --no-print-directory dev.print-container.coursegraph) -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/coursegraph.tar.gz

Expand Down
18 changes: 17 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,21 @@ services:
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"

meilisearch184:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.meilisearch184"
hostname: meilisearch184.devstack.edx
image: getmeili/meilisearch:v1.8.4
networks:
default:
aliases:
- meilisearch
ports:
- "7700:7700"
volumes:
- meilisearch184_data:/usr/share/meilisearch/data
environment:
- MEILI_MASTER_KEY=my_super_secret_key

# This is meant to be used to test OS upgrades.
opensearch12:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.opensearch12"
Expand Down Expand Up @@ -642,7 +657,7 @@ services:
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms"
hostname: cms.devstack.edx
depends_on:
- elasticsearch710
- meilisearch184
- lms
- memcached
- mongo
Expand Down Expand Up @@ -1242,6 +1257,7 @@ volumes:
edxapp_lms_assets:
edxapp_cms_assets:
elasticsearch710_data:
meilisearch184_data:
mongo_data:
mongo_config_data:
opensearch12_data:
Expand Down
2 changes: 1 addition & 1 deletion options.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ credentials+cms+discovery+ecommerce+insights+lms+registrar
# All third-party services.
# Separated by plus signs. Listed in alphabetical order for clarity.
THIRD_PARTY_SERVICES ?= \
chrome+coursegraph+elasticsearch710+firefox+memcached+mongo+mysql80+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
chrome+coursegraph+elasticsearch710+meilisearch184+firefox+memcached+mongo+mysql80+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
10 changes: 1 addition & 9 deletions py_configuration_files/cms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,7 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
################################ SEARCH INDEX ################################
FEATURES['ENABLE_COURSEWARE_INDEX'] = True
FEATURES['ENABLE_LIBRARY_INDEX'] = False
SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"

ELASTIC_SEARCH_CONFIG = [
{
'use_ssl': False,
'host': 'edx.devstack.elasticsearch710',
'port': 9200
}
]
SEARCH_ENGINE = "search.meilisearch.MeilisearchEngine"

################################ COURSE DISCUSSIONS ###########################
FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
Expand Down