fix: localnet status and proxy dns issue (#525)

Author: neilcampbell

src/algokit/cli/localnet.py

@@ -210,7 +210,7 @@ def reset_localnet(*, update: bool) -> None:
     sandbox.up()
 
 
-SERVICE_NAMES = ("algod", "conduit", "indexer-db", "indexer")
+SERVICE_NAMES = ("algod", "conduit", "indexer-db", "indexer", "proxy")
 
 
 @localnet_group.command("status", short_help="Check the status of the AlgoKit LocalNet.")
@@ -237,10 +237,10 @@ def localnet_status() -> None:
     }
     # fill out remaining output_by_name["algod"] values
     if output_by_name["algod"]["Status"] == "Running":
-        output_by_name["algod"].update(fetch_algod_status_data(ps_by_name["algod"]))
+        output_by_name["algod"].update(fetch_algod_status_data(ps_by_name["proxy"]))
     # fill out remaining output_by_name["indexer"] values
     if output_by_name["indexer"]["Status"] == "Running":
-        output_by_name["indexer"].update(fetch_indexer_status_data(ps_by_name["indexer"]))
+        output_by_name["indexer"].update(fetch_indexer_status_data(ps_by_name["proxy"]))
 
     # Print the status details
     for service_name, service_info in output_by_name.items():

src/algokit/core/sandbox.py

@@ -443,38 +443,24 @@ def get_proxy_config(algod_port: int = DEFAULT_ALGOD_PORT, kmd_port: int = 4002)
 http {{
   access_log off;
 
+  resolver 127.0.0.11 ipv6=off valid=10s;
+  resolver_timeout 5s;
+
   map $request_method$http_access_control_request_private_network $cors_allow_private_network {{
     "OPTIONStrue" "true";
     default "";
   }}
 
   add_header Access-Control-Allow-Private-Network $cors_allow_private_network;
 
-  upstream algod_api {{
-    zone upstreams 64K;
-    server algod:8080 max_fails=1 fail_timeout=2s;
-    keepalive 2;
-  }}
-
-  upstream kmd_api {{
-    zone upstreams 64K;
-    server algod:7833 max_fails=1 fail_timeout=2s;
-    keepalive 2;
-  }}
-
-  upstream indexer_api {{
-    zone upstreams 64K;
-    server indexer:8980 max_fails=1 fail_timeout=2s;
-    keepalive 2;
-  }}
-
   server {{
     listen {algod_port};
 
     location / {{
       proxy_set_header Host $host;
-      proxy_pass http://algod_api;
       proxy_pass_header Server;
+      set $target http://algod:8080;
+      proxy_pass $target;
     }}
   }}
 
@@ -483,8 +469,9 @@ def get_proxy_config(algod_port: int = DEFAULT_ALGOD_PORT, kmd_port: int = 4002)
 
     location / {{
       proxy_set_header Host $host;
-      proxy_pass http://kmd_api;
       proxy_pass_header Server;
+      set $target http://algod:7833;
+      proxy_pass $target;
     }}
   }}
 
@@ -493,8 +480,9 @@ def get_proxy_config(algod_port: int = DEFAULT_ALGOD_PORT, kmd_port: int = 4002)
 
     location / {{
       proxy_set_header Host $host;
-      proxy_pass http://indexer_api;
       proxy_pass_header Server;
+      set $target http://indexer:8980;
+      proxy_pass $target;
     }}
   }}
 }}
@@ -514,8 +502,6 @@ def get_docker_compose_yml(
     container_name: "{name}_algod"
     image: {ALGORAND_IMAGE}
     ports:
-      - 8080
-      - 7833
       - {tealdbg_port}:9392
     environment:
       START_KMD: 1
@@ -559,8 +545,6 @@ def get_docker_compose_yml(
   indexer:
     container_name: "{name}_indexer"
     image: {INDEXER_IMAGE}
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment:
@@ -635,7 +619,7 @@ def fetch_indexer_status_data(service_info: dict[str, Any]) -> dict[str, Any]:
         if not any(item["PublishedPort"] == DEFAULT_INDEXER_PORT for item in service_info["Publishers"]):
             return {"Status": "Error"}
 
-        results["Port"] = service_info["Publishers"][0]["PublishedPort"]
+        results["Port"] = DEFAULT_INDEXER_PORT
         # container specific response
         health_url = f"{DEFAULT_ALGOD_SERVER}:{DEFAULT_INDEXER_PORT}/health"
         http_response = httpx.get(health_url, timeout=5)

tests/localnet/test_localnet_reset.test_localnet_reset_with_existing_sandbox_with_out_of_date_config.approved.txt

@@ -33,8 +33,6 @@ services:
     container_name: "algokit_sandbox_algod"
     image: algorand/algod:latest
     ports:
-      - 8080
-      - 7833
       - 9392:9392
     environment:
       START_KMD: 1
@@ -78,8 +76,6 @@ services:
   indexer:
     container_name: "algokit_sandbox_indexer"
     image: algorand/indexer:latest
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment:

tests/localnet/test_localnet_reset.test_localnet_reset_without_existing_sandbox.approved.txt

@@ -25,8 +25,6 @@ services:
     container_name: "algokit_sandbox_algod"
     image: algorand/algod:latest
     ports:
-      - 8080
-      - 7833
       - 9392:9392
     environment:
       START_KMD: 1
@@ -70,8 +68,6 @@ services:
   indexer:
     container_name: "algokit_sandbox_indexer"
     image: algorand/indexer:latest
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment:

tests/localnet/test_localnet_start.test_localnet_start.approved.txt

@@ -31,8 +31,6 @@ services:
     container_name: "algokit_sandbox_algod"
     image: algorand/algod:latest
     ports:
-      - 8080
-      - 7833
       - 9392:9392
     environment:
       START_KMD: 1
@@ -76,8 +74,6 @@ services:
   indexer:
     container_name: "algokit_sandbox_indexer"
     image: algorand/indexer:latest
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment:

tests/localnet/test_localnet_start.test_localnet_start_health_bad_status.approved.txt

@@ -31,8 +31,6 @@ services:
     container_name: "algokit_sandbox_algod"
     image: algorand/algod:latest
     ports:
-      - 8080
-      - 7833
       - 9392:9392
     environment:
       START_KMD: 1
@@ -76,8 +74,6 @@ services:
   indexer:
     container_name: "algokit_sandbox_indexer"
     image: algorand/indexer:latest
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment:

tests/localnet/test_localnet_start.test_localnet_start_health_failure.approved.txt

@@ -30,8 +30,6 @@ services:
     container_name: "algokit_sandbox_algod"
     image: algorand/algod:latest
     ports:
-      - 8080
-      - 7833
       - 9392:9392
     environment:
       START_KMD: 1
@@ -75,8 +73,6 @@ services:
   indexer:
     container_name: "algokit_sandbox_indexer"
     image: algorand/indexer:latest
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment:

tests/localnet/test_localnet_start.test_localnet_start_with_name.approved.txt

@@ -34,8 +34,6 @@ services:
     container_name: "algokit_sandbox_test_algod"
     image: algorand/algod:latest
     ports:
-      - 8080
-      - 7833
       - 9392:9392
     environment:
       START_KMD: 1
@@ -79,8 +77,6 @@ services:
   indexer:
     container_name: "algokit_sandbox_test_indexer"
     image: algorand/indexer:latest
-    ports:
-      - 8980
     restart: unless-stopped
     command: daemon --enable-all-parameters
     environment: