From d2818d7d7038122154f1dd64540d0c7265622f95 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Wed, 6 Sep 2023 15:21:03 +0500 Subject: [PATCH] fix: docker-compose rebased --- docker-compose.yml | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f545c13a70..9635a5183f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,42 +50,6 @@ services: environment: NEO4J_AUTH: "neo4j/edx" # Initial username/password for Neo4j Web interface. - elasticsearch: - container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.elasticsearch" - hostname: elasticsearch.devstack.edx - image: edxops/elasticsearch:devstack - networks: - default: - aliases: - - edx.devstack.elasticsearch - # TODO: What to do about these forwarded ports? They'll conflict with ports forwarded by the Vagrant VM. - # ports: - # - "9200:9200" - # - "9300:9300" - volumes: - - elasticsearch_data:/usr/share/elasticsearch/data - - elasticsearch_data:/usr/share/elasticsearch/logs - - # This is meant to be used to test ES upgrades so that we do not have to upgrade all of our services to ES5 at once. - elasticsearch7: - container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.elasticsearch7" - hostname: elasticsearch7.devstack.edx - image: elasticsearch:7.8.1 - networks: - default: - aliases: - - edx.devstack.elasticsearch7 - ports: - - "9200:9200" - - "9300:9300" - volumes: - - elasticsearch7_data:/usr/share/elasticsearch/data - environment: - - discovery.type=single-node - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - # This is meant to be used to test ES upgrades. elasticsearch710: container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.elasticsearch710" hostname: elasticsearch710.devstack.edx @@ -870,4 +834,4 @@ volumes: opensearch12_data: mysql57_data: mysql80_data: - redis_data: + redis_data: \ No newline at end of file