Merge pull request #82 from antojoseph/master

Add docker desktop support, tested on macOS Sonoma

.hack/devnet/run.sh

@@ -48,11 +48,21 @@ beaconapi:
  redisCacheAddr: ""
  redisCachePrefix: ""
  endpoints:
-$(docker inspect -f " - { name: {{ with index .Config.Labels \"com.kurtosistech.id\"}}{{.}}{{end}}, url: http://{{ with index .NetworkSettings.Networks \"kt-$ENCLAVE_NAME\"}}{{.IPAddress }}:4000{{end}} }" $BEACON_NODES)
+$(for node in $BEACON_NODES; do
+ name=$(docker inspect -f "{{ with index .Config.Labels \"com.kurtosistech.id\"}}{{.}}{{end}}" $node)
+ ip=$(echo '127.0.0.1')
+ port=$(docker inspect --format='{{ (index (index .NetworkSettings.Ports "4000/tcp") 0).HostPort }}' $node)
+ echo " - { name: $name, url: http://$ip:$port }"
+done)
 executionapi:
  depositLogBatchSize: 1000
  endpoints:
-$(docker inspect -f " - { name: {{ with index .Config.Labels \"com.kurtosistech.id\"}}{{.}}{{end}}, url: http://{{ with index .NetworkSettings.Networks \"kt-$ENCLAVE_NAME\"}}{{.IPAddress }}:8545{{end}} }" $EXECUTION_NODES)
+$(for node in $EXECUTION_NODES; do
+ name=$(docker inspect -f "{{ with index .Config.Labels \"com.kurtosistech.id\"}}{{.}}{{end}}" $node)
+ ip=$(echo '127.0.0.1')
+ port=$(docker inspect --format='{{ (index (index .NetworkSettings.Ports "8545/tcp") 0).HostPort }}' $node)
+ echo " - { name: $name, url: http://$ip:$port }"
+done)
 indexer:
  inMemoryEpochs: 8
  cachePersistenceDelay: 8
@@ -71,4 +81,4 @@ Dora config at ${__dir}/generated-dora-config.yaml
 Chain config at ${__dir}/generated-chain-config.yaml
 Database at ${__dir}/generated-database.sqlite
 ============================================================================================================
-EOF
+EOF

Makefile

@@ -27,4 +27,4 @@ devnet-run: devnet
  go run cmd/dora-explorer/main.go --config .hack/devnet/generated-dora-config.yaml
 
 devnet-clean:
- .hack/devnet/cleanup.sh
+ .hack/devnet/cleanup.sh