From 35779428d329cccc93374c54e1db7cf25d436eb6 Mon Sep 17 00:00:00 2001 From: willcl-ark Date: Sat, 23 Mar 2024 10:02:00 +0000 Subject: [PATCH 1/2] docker: fix silly breaking docker change No idea why, and don't plan on finding out. But `localhost` now does not work in a healthcheck. Use 127.0.0.1 instead. --- src/backends/compose/compose_backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/compose/compose_backend.py b/src/backends/compose/compose_backend.py index 1099fd443..1fbbfc52f 100644 --- a/src/backends/compose/compose_backend.py +++ b/src/backends/compose/compose_backend.py @@ -401,7 +401,7 @@ def add_services(self, tank: Tank, compose): "privileged": True, "cap_add": ["NET_ADMIN", "NET_RAW"], "healthcheck": { - "test": ["CMD-SHELL", f"nc -z localhost {tank.rpc_port} || exit 1"], + "test": ["CMD-SHELL", f"nc -z 127.0.0.1 {tank.rpc_port} || exit 1"], "interval": "10s", # Check every 10 seconds "timeout": "1s", # Give the check 1 second to complete "start_period": "5s", # Start checking after 5 seconds From 3ec8b6c279cc76758e18458f7a9bb15f5d53c8ea Mon Sep 17 00:00:00 2001 From: Matthew Zipkin Date: Sun, 24 Mar 2024 11:18:38 -0400 Subject: [PATCH 2/2] docker: replace more localhost with 127.0.0.1 --- src/backends/kubernetes/kubernetes_backend.py | 4 ++-- src/cli/rpc.py | 2 +- test/ln_test.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backends/kubernetes/kubernetes_backend.py b/src/backends/kubernetes/kubernetes_backend.py index cff494474..8f8805729 100644 --- a/src/backends/kubernetes/kubernetes_backend.py +++ b/src/backends/kubernetes/kubernetes_backend.py @@ -393,7 +393,7 @@ def create_prometheus_container(self, tank) -> client.V1Container: name="prometheus", image="jvstein/bitcoin-prometheus-exporter:latest", env=[ - client.V1EnvVar(name="BITCOIN_RPC_HOST", value="localhost"), + client.V1EnvVar(name="BITCOIN_RPC_HOST", value="127.0.0.1"), client.V1EnvVar(name="BITCOIN_RPC_PORT", value=str(tank.rpc_port)), client.V1EnvVar(name="BITCOIN_RPC_USER", value=tank.rpc_user), client.V1EnvVar(name="BITCOIN_RPC_PASSWORD", value=tank.rpc_password), @@ -505,7 +505,7 @@ def create_circuitbreaker_container(self, tank, volume_mounts) -> client.V1Conta image=tank.lnnode.cb, args=[ "--network=regtest", - f"--rpcserver=localhost:{tank.lnnode.rpc_port}", + f"--rpcserver=127.0.0.1:{tank.lnnode.rpc_port}", f"--tlscertpath={LND_MOUNT_PATH}/tls.cert", f"--macaroonpath={LND_MOUNT_PATH}/data/chain/bitcoin/regtest/admin.macaroon", ], diff --git a/src/cli/rpc.py b/src/cli/rpc.py index bac812579..9380ede0c 100644 --- a/src/cli/rpc.py +++ b/src/cli/rpc.py @@ -19,7 +19,7 @@ def __init__(self, code, message): def rpc_call(rpc_method, params: dict[str, Any] | tuple[Any, ...] | None): payload = request(rpc_method, params) - url = f"http://localhost:{WARNET_SERVER_PORT}/api" + url = f"http://127.0.0.1:{WARNET_SERVER_PORT}/api" try: response = requests.post(url, json=payload) except ConnectionRefusedError as e: diff --git a/test/ln_test.py b/test/ln_test.py index 893d1e3b4..7fd660430 100755 --- a/test/ln_test.py +++ b/test/ln_test.py @@ -14,7 +14,7 @@ def get_cb_forwards(index): - cmd = "wget -q -O - localhost:9235/api/forwarding_history" + cmd = "wget -q -O - 127.0.0.1:9235/api/forwarding_history" res = base.wait_for_rpc( "exec_run", [index, ServiceType.CIRCUITBREAKER.value, cmd, base.network_name] )