From 1c9d5d7554a07aecd917eb7290a0af5fde228f6a Mon Sep 17 00:00:00 2001
From: Andrew Kostka <andrew.kostka@wikimedia.de>
Date: Fri, 8 Mar 2024 13:58:11 +0000
Subject: [PATCH] Local environment should only use Elasticsearch 7.10.2

---
 docker-compose.yml | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a8ab0d074..cc8c037ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,13 +26,9 @@ services:
       - MW_DB_SERVER_MASTER=mysql.svc:3306
       - MW_DB_SERVER_REPLICA=mysql-replica.svc:3306
 
-      - MW_DEFAULT_ELASTICSEARCH_HOST=elasticsearch-6.svc
+      - MW_DEFAULT_ELASTICSEARCH_HOST=elasticsearch.svc
       - MW_DEFAULT_ELASTICSEARCH_PORT=9200
-      - MW_DEFAULT_ELASTICSEARCH_ES6=true
-
-      - MW_WRITE_ONLY_ELASTICSEARCH_HOST=elasticsearch-7.svc
-      - MW_WRITE_ONLY_ELASTICSEARCH_PORT=9200
-      - MW_WRITE_ONLY_ELASTICSEARCH_ES6=false
+      - MW_DEFAULT_ELASTICSEARCH_ES6=false
 
       - MW_REDIS_SERVER_READ=redis.svc
       - MW_REDIS_SERVER_WRITE=redis.svc
@@ -143,28 +139,15 @@ services:
         aliases:
           - redis.svc
 
-  elasticsearch-6:
-    image: wikibase/elasticsearch:6.8.23-wmde.6
-    restart: unless-stopped
-    ports:
-      - 9200:9200
-    networks:
-      default:
-        aliases:
-          - elasticsearch-6.svc
-    environment:
-      discovery.type: single-node
-      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
-
-  elasticsearch-7:
+  elasticsearch:
     image: wikibase/elasticsearch:7.10.2-wmde.11
     restart: unless-stopped
     ports:
-      - 9201:9200
+      - 9200:9200
     networks:
       default:
         aliases:
-          - elasticsearch-7.svc
+          - elasticsearch.svc
     environment:
       discovery.type: single-node
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"