Skip to content

Commit 9dbb3d4

Browse files
Muhammad Faraz  MaqsoodMuhammad Faraz  Maqsood
authored andcommitted
feat: add meilisearch container for v2 libraries in cms
1 parent bbfa2e8 commit 9dbb3d4

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"27017": { "label": "mongo" },
4848
"9201": { "label": "elasticsearch710" },
4949
"9301": { "label": "elasticsearch710" },
50+
"7700": { "label": "meilisearch184" },
5051
"9202": { "label": "opensearch12" },
5152
"9600": { "label": "opensearch12" },
5253
"8081": { "label": "schema-registry" },

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,19 @@ dev.provision.%: dev.check-memory ## Provision specified services.
186186
echo $*
187187
bash ./provision.sh $*
188188

189-
dev.backup: dev.up.mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Write all data volumes to the host.
189+
dev.backup: dev.up.mysql80+mongo+elasticsearch710+meilisearch184+opensearch12+coursegraph ## Write all data volumes to the host.
190190
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
191191
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
192192
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
193+
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
193194
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
194195
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
195196

196-
dev.restore: dev.up.mysql80+mongo+elasticsearch710+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
197+
dev.restore: dev.up.mysql80+mongo+elasticsearch710+meilisearch184+opensearch12+coursegraph ## Restore all data volumes from the host. WILL OVERWRITE ALL EXISTING DATA!
197198
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
198199
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
199200
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
201+
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
200202
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
201203
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
202204

docker-compose.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,21 @@ services:
6666
- bootstrap.memory_lock=true
6767
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
6868

69+
meilisearch184:
70+
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.meilisearch184"
71+
hostname: meilisearch184.devstack.edx
72+
image: getmeili/meilisearch:v1.8.4
73+
networks:
74+
default:
75+
aliases:
76+
- meilisearch
77+
ports:
78+
- "7700:7700"
79+
volumes:
80+
- meilisearch184_data:/usr/share/meilisearch/data
81+
environment:
82+
- MEILI_MASTER_KEY=my_super_secret_key
83+
6984
# This is meant to be used to test OS upgrades.
7085
opensearch12:
7186
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.opensearch12"
@@ -642,7 +657,7 @@ services:
642657
container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.cms"
643658
hostname: cms.devstack.edx
644659
depends_on:
645-
- elasticsearch710
660+
- meilisearch184
646661
- lms
647662
- memcached
648663
- mongo
@@ -1260,6 +1275,7 @@ volumes:
12601275
edxapp_lms_assets:
12611276
edxapp_cms_assets:
12621277
elasticsearch710_data:
1278+
meilisearch184_data:
12631279
mongo_data:
12641280
mongo_config_data:
12651281
opensearch12_data:

options.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ credentials+cms+discovery+ecommerce+insights+lms+registrar
9090
# All third-party services.
9191
# Separated by plus signs. Listed in alphabetical order for clarity.
9292
THIRD_PARTY_SERVICES ?= \
93-
chrome+coursegraph+elasticsearch710+firefox+memcached+mongo+mysql80+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica
93+
chrome+coursegraph+elasticsearch710+meilisearch184+firefox+memcached+mongo+mysql80+opensearch12+redis+namenode+datanode+resourcemanager+nodemanager+sparkmaster+sparkworker+vertica

py_configuration_files/cms.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,7 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
146146
################################ SEARCH INDEX ################################
147147
FEATURES['ENABLE_COURSEWARE_INDEX'] = True
148148
FEATURES['ENABLE_LIBRARY_INDEX'] = False
149-
SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
150-
151-
ELASTIC_SEARCH_CONFIG = [
152-
{
153-
'use_ssl': False,
154-
'host': 'edx.devstack.elasticsearch710',
155-
'port': 9200
156-
}
157-
]
149+
SEARCH_ENGINE = "search.meilisearch.MeilisearchEngine"
158150

159151
################################ COURSE DISCUSSIONS ###########################
160152
FEATURES['ENABLE_DISCUSSION_SERVICE'] = True

0 commit comments

Comments
 (0)