diff --git a/dev-tools/compose/docker-compose.discovery.prod.yml b/dev-tools/compose/docker-compose.discovery.prod.yml index e8b76e06da6..018fc10acc7 100644 --- a/dev-tools/compose/docker-compose.discovery.prod.yml +++ b/dev-tools/compose/docker-compose.discovery.prod.yml @@ -67,6 +67,9 @@ services: context: ${PROJECT_ROOT}/packages/es-indexer dockerfile: Dockerfile restart: unless-stopped + environment: + audius_elasticsearch_url: http://discovery-provider-elasticsearch:9200 + audius_db_url: 'postgresql://postgres:postgres@db:5432/discovery_provider_1' depends_on: db: condition: service_healthy @@ -113,6 +116,7 @@ services: audius_contracts_entity_manager_address: '${ENTITY_MANAGER_ADDRESS}' audius_eth_contracts_registry: '${ETH_REGISTRY_ADDRESS}' audius_eth_contracts_token: '${ETH_TOKEN_ADDRESS}' + audius_elasticsearch_url: http://discovery-provider-elasticsearch:9200 audius_solana_endpoint: 'http://solana-test-validator:8899' audius_solana_track_listen_count_address: '${SOLANA_TRACK_LISTEN_COUNT_PUBLIC_KEY}' diff --git a/dev-tools/compose/docker-compose.test.yml b/dev-tools/compose/docker-compose.test.yml index 06c55f4927b..8886ff8993e 100644 --- a/dev-tools/compose/docker-compose.test.yml +++ b/dev-tools/compose/docker-compose.test.yml @@ -239,7 +239,6 @@ services: audius_redis_url: 'redis://discovery-provider-redis:6379/00' audius_elasticsearch_url: 'http://discovery-provider-elasticsearch:9200' - audius_elasticsearch_run_indexer: 'true' volumes: - ${PROJECT_ROOT}/packages/discovery-provider:/audius-discovery-provider depends_on: diff --git a/dev-tools/startup/discovery-provider.sh b/dev-tools/startup/discovery-provider.sh index 7720243bc88..777b66def75 100644 --- a/dev-tools/startup/discovery-provider.sh +++ b/dev-tools/startup/discovery-provider.sh @@ -19,7 +19,6 @@ export audius_delegate_private_key=$(printenv "DP${replica}_DELEGATE_OWNER_PRIVA elasticsearch_host=$(nslookup $(hostname -i) | grep -o "name = .*" | grep -o "[^ ]\+$" | sed 's/discovery-provider/discovery-provider-elasticsearch/') if nslookup "$elasticsearch_host" >/dev/null 2>&1; then export audius_elasticsearch_url="http://$elasticsearch_host:9200" - export audius_elasticsearch_run_indexer="true" fi # Run register script in background diff --git a/packages/discovery-provider/plugins/pedalboard/docker/startup.sh b/packages/discovery-provider/plugins/pedalboard/docker/startup.sh index 53d43076f71..a602d2a14fd 100644 --- a/packages/discovery-provider/plugins/pedalboard/docker/startup.sh +++ b/packages/discovery-provider/plugins/pedalboard/docker/startup.sh @@ -22,7 +22,6 @@ export audius_delegate_private_key=$(printenv "DP${replica}_DELEGATE_OWNER_PRIVA elasticsearch_host="audius-protocol-discovery-provider-elasticsearch-${replica}" if nslookup "$elasticsearch_host" >/dev/null 2>&1; then export audius_elasticsearch_url="http://${elasticsearch_host}:9200" - export audius_elasticsearch_run_indexer="true" fi npm run dev \ No newline at end of file diff --git a/packages/es-indexer/README.md b/packages/es-indexer/README.md index e1f40b50f0d..e902373991d 100644 --- a/packages/es-indexer/README.md +++ b/packages/es-indexer/README.md @@ -6,7 +6,6 @@ To run in the discovery container, set env variables: ``` audius_elasticsearch_url=http://elasticsearch:9200 -audius_elasticsearch_run_indexer=true ``` ## Mapping Changes