From 9cfdf533d44b65e869d459e01de51d0059f3540e Mon Sep 17 00:00:00 2001
From: Marc-Aurele Besner <marcaurele.desk@gmail.com>
Date: Wed, 13 Nov 2024 07:58:58 -0500
Subject: [PATCH] improve docker setup for node

---
 .env               |  8 ++++----
 docker-compose.yml | 17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.env b/.env
index cf0599d1..afef4886 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,7 @@ NETWORK_ID=mainnet
 LOG_LEVEL=debug
 
 # Mainnet
-NODE_DOCKER_TAG="mainnet-2024-nov-05"
+NODE_DOCKER_TAG=mainnet-2024-nov-13
 # Testnet - Taurus
 # NODE_DOCKER_TAG="taurus-candidate"
 
@@ -19,11 +19,11 @@ DB_PORT=5432
 DB_HOST=postgres
 
 # Mainnet
-RPC_URLS="ws://caddy:80,wss://rpc-0.mainnet.subspace.network/ws,wss://rpc-1.mainnet.subspace.network/ws,wss://rpc-0.mainnet.autonomys.xyz/ws,wss://rpc-1.mainnet.autonomys.xyz/ws"
+RPC_URLS="ws://caddy:8000,wss://rpc-0.mainnet.subspace.network/ws,wss://rpc-1.mainnet.subspace.network/ws,wss://rpc-0.mainnet.autonomys.xyz/ws,wss://rpc-1.mainnet.autonomys.xyz/ws"
 CHAIN_ID="0x66455a580aabff303720aa83adbe6c44502922251c03ba73686d5245da9e21bd"
 
 # Testnet - Taurus
-# RPC_URLS="ws://caddy:80,wss://rpc-0.taurus.subspace.network/ws"
+# RPC_URLS="ws://caddy:8000,wss://rpc-0.taurus.subspace.network/ws"
 # CHAIN_ID="0x295aeafca762a304d92ee1505548695091f6082d3f0aa4d092ac3cd6397a6c5e"
 
 HASURA_GRAPHQL_PORT=8080
@@ -39,7 +39,7 @@ DICTIONARY_DIRECTORY=autonomys
 # Testnet - Taurus
 # DICTIONARY_DIRECTORY=autonomys-taurus
 DICTIONARY_SUBQUERY_NODE_PORT=3010
-DICTIONARY_URL="http://dictionary_subquery_node:3000"
+DICTIONARY_URL="http://dictionary_subquery_node:3010"
 
 REDIS_PORT=6379
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dbf2ea39..675ba95d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -55,7 +55,6 @@ services:
         "1000",
         "--rpc-max-connections",
         "20000",
-        "--farmer",
         "--name",
         "astral",
         "--sync",
@@ -153,7 +152,7 @@ services:
       DB_PASS: ${DB_PASSWORD}
       DB_DATABASE: ${DB_DATABASE}
       DB_HOST: ${DB_HOST}
-      DB_PORT: 5432
+      DB_PORT: ${DB_PORT}
     volumes:
       - ./indexers/dictionary/${DICTIONARY_DIRECTORY}:/dictionary
     healthcheck:
@@ -181,7 +180,7 @@ services:
       DB_PASS: ${DB_PASSWORD}
       DB_DATABASE: ${DB_DATABASE}
       DB_HOST: ${DB_HOST}
-      DB_PORT: 5432
+      DB_PORT: ${DB_PORT}
     command:
       - --name=dictionary
       - --playground
@@ -201,12 +200,12 @@ services:
     environment:
       ENDPOINT: ${RPC_URLS}
       CHAIN_ID: ${CHAIN_ID}
-      DICTIONARY: http://dictionary_subquery_node:3000
+      DICTIONARY: http://dictionary_subquery_node:${DICTIONARY_SUBQUERY_NODE_PORT}
       DB_USER: ${DB_USER}
       DB_PASS: ${DB_PASSWORD}
       DB_DATABASE: ${DB_DATABASE}
       DB_HOST: ${DB_HOST}
-      DB_PORT: 5432
+      DB_PORT: ${DB_PORT}
     volumes:
       - ./indexers/${NETWORK_ID}/consensus:/${NETWORK_ID}/consensus
     command:
@@ -238,12 +237,12 @@ services:
     environment:
       ENDPOINT: ${RPC_URLS}
       CHAIN_ID: ${CHAIN_ID}
-      DICTIONARY: http://dictionary_subquery_node:3000
+      DICTIONARY: http://dictionary_subquery_node:${DICTIONARY_SUBQUERY_NODE_PORT}
       DB_USER: ${DB_USER}
       DB_PASS: ${DB_PASSWORD}
       DB_DATABASE: ${DB_DATABASE}
       DB_HOST: ${DB_HOST}
-      DB_PORT: 5432
+      DB_PORT: ${DB_PORT}
     volumes:
       - ./indexers/${NETWORK_ID}/leaderboard:/${NETWORK_ID}/leaderboard
     command:
@@ -274,12 +273,12 @@ services:
     environment:
       ENDPOINT: ${RPC_URLS}
       CHAIN_ID: ${CHAIN_ID}
-      DICTIONARY: http://dictionary_subquery_node:3000
+      DICTIONARY: http://dictionary_subquery_node:${DICTIONARY_SUBQUERY_NODE_PORT}
       DB_USER: ${DB_USER}
       DB_PASS: ${DB_PASSWORD}
       DB_DATABASE: ${DB_DATABASE}
       DB_HOST: ${DB_HOST}
-      DB_PORT: 5432
+      DB_PORT: ${DB_PORT}
     volumes:
       - ./indexers/${NETWORK_ID}/staking:/${NETWORK_ID}/staking
     command: