Configuration fixes for mobymask-v2 stack for multiple deployments #318

Merged
prathamesh0 merged 6 commits from pm-fix-mobymask-v2-config into main 2023-04-12 12:47:13 +00:00
3 changed files with 16 additions and 14 deletions
Showing only changes of commit aabd165995 - Show all commits

View File

@ -19,20 +19,22 @@ echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"
# Use config from mounted volume if available (when running web-app along with watcher stack) # Use config from mounted volume if available (when running web-app along with watcher stack)
if [ -f /server/config.json ]; then if [ -f /server/config.json ]; then
echo "Merging config for deployed contract from mounted volume" echo "Taking config for deployed contract from mounted volume"
# Merging config files to get deployed contract address
jq -s '.[0] * .[1]' /app/src/mobymask-app-config.json /server/config.json > /app/src/config.json
else
echo "Setting deployed contract details from env"
# Set config values from environment variables # Get deployed contract address and chain id
jq --arg address "$CERC_DEPLOYED_CONTRACT" \ CERC_DEPLOYED_CONTRACT=$(jq -r '.address' /server/config.json | tr -d '"')
--argjson chainId "$CERC_CHAIN_ID" \ CERC_CHAIN_ID=$(jq -r '.chainId' /server/config.json)
--argjson relayNodes "$CERC_RELAY_NODES" \ else
'.address = $address | .chainId = $chainId | .relayNodes = $relayNodes' \ echo "Taking deployed contract details from env"
/app/src/mobymask-app-config.json > /app/src/config.json
fi fi
# Export config values in a json file
jq --arg address "$CERC_DEPLOYED_CONTRACT" \
--argjson chainId "$CERC_CHAIN_ID" \
--argjson relayNodes "$CERC_RELAY_NODES" \
'.address = $address | .chainId = $chainId | .relayNodes = $relayNodes' \
/app/src/mobymask-app-config.json > /app/src/config.json
REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" npm run build REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" npm run build
serve -s build serve -s build

View File

@ -14,7 +14,7 @@ fi
echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES" echo "Using CERC_RELAY_NODES $CERC_RELAY_NODES"
# Set relay nodes in config from CERC_RELAY_NODES environment variable # Set relay nodes in config using CERC_RELAY_NODES
jq --argjson relayNodes "$CERC_RELAY_NODES" \ jq --argjson relayNodes "$CERC_RELAY_NODES" \
'.relayNodes = $relayNodes' \ '.relayNodes = $relayNodes' \
./src/test-app-config.json > ./src/config.json ./src/test-app-config.json > ./src/config.json

View File

@ -122,8 +122,8 @@ Clear volumes created by this stack:
```bash ```bash
# List all relevant volumes # List all relevant volumes
docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*mobymask_deployment|.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data" docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data"
# Remove all the listed volumes # Remove all the listed volumes
docker volume rm $(docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*mobymask_deployment|.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data") docker volume rm $(docker volume ls -q --filter "name=.*mobymask_watcher_db_data|.*peers_ids|.*mobymask_deployment|.*fixturenet_geth_accounts|.*l1_deployment|.*l2_accounts|.*l2_config|.*l2_geth_data")
``` ```