From d1e0a522a6755a4ecb334c5a7cdcc26e2838879d Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Thu, 29 Jul 2021 07:19:35 +0500
Subject: [PATCH 1/2] feat: update elasticsearch to 7.10 for forum service

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a909cc65ab..5a44ccf3c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -299,9 +299,9 @@ services:
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.forum"
     hostname: forum.devstack.edx
     depends_on:
-      - elasticsearch7
       - memcached
       - mongo
+      - elasticsearch710
     image: edxops/forum:${OPENEDX_RELEASE:-latest}
     stdin_open: true
     tty: true

From c7118f8e322663a64835b5cadc24d1c4bc7a1b1f Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Tue, 10 Aug 2021 15:10:52 +0500
Subject: [PATCH 2/2] feat: add command to build indices for forum service

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 13075043e9..5ad2ddbe7b 100644
--- a/Makefile
+++ b/Makefile
@@ -420,6 +420,9 @@ dev.restart-devserver: _expects-service.dev.restart-devserver
 dev.restart-devserver.forum:
 	docker-compose exec forum bash -c 'kill $$(ps aux | grep "ruby app.rb" | egrep -v "while|grep" | awk "{print \$$2}")'
 
+dev.forum.build-indices: ## Build indices for forum service
+	docker-compose exec forum bash -c "cd forum && source ruby_env && source devstack_forum_env && cd cs_comments_service/ && bin/rake search:rebuild_indices"
+
 dev.restart-devserver.%: ## Kill an edX service's development server. Watcher should restart it.
 	# Applicable to Django services only.
 	docker-compose exec $* bash -c 'kill $$(ps aux | egrep "manage.py ?\w* runserver" | egrep -v "while|grep" | awk "{print \$$2}")'