From f4c13e1a154debeac27da472f0713e5f9c55e79b Mon Sep 17 00:00:00 2001 From: Lakshya Singh Date: Tue, 7 Nov 2023 19:00:31 +0530 Subject: [PATCH] dockerfile: reduce interval and env config - bitcoind and cln reduce healthcheck time interval - cln healthcheck no need to use switch case instead use VLS_NETWORK Signed-off-by: Lakshya Singh --- bitcoind/Dockerfile | 2 +- docker-compose.regtest.yml | 1 - docker-compose.yml | 1 - lightningd/Dockerfile | 2 +- lightningd/healthcheck.sh | 11 +---------- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/bitcoind/Dockerfile b/bitcoind/Dockerfile index ed23efd..61d719f 100644 --- a/bitcoind/Dockerfile +++ b/bitcoind/Dockerfile @@ -133,7 +133,7 @@ ENTRYPOINT ["/entrypoint.sh"] RUN bitcoind -version | grep "Bitcoin Core version v${BITCOIN_VERSION}" -HEALTHCHECK --interval=60s --timeout=10s --start-period=30s \ +HEALTHCHECK --interval=10s --timeout=20s --start-period=30s \ CMD ["/bin/sh", "-c", "/healthcheck.sh"] CMD ["bitcoind"] diff --git a/docker-compose.regtest.yml b/docker-compose.regtest.yml index 7c4542d..afdc3c5 100644 --- a/docker-compose.regtest.yml +++ b/docker-compose.regtest.yml @@ -19,7 +19,6 @@ services: ports: - 19846:19846 environment: - - BITCOIN_CHAIN=regtest - VLS_NETWORK=regtest - BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:38332 diff --git a/docker-compose.yml b/docker-compose.yml index ee3182a..e918302 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,6 @@ services: bitcoin-core: condition: service_healthy environment: - - BITCOIN_CHAIN=test - BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:18332 - RUST_LOG=info - VLS_NETWORK=testnet diff --git a/lightningd/Dockerfile b/lightningd/Dockerfile index 879ca72..ed603d7 100644 --- a/lightningd/Dockerfile +++ b/lightningd/Dockerfile @@ -142,7 +142,7 @@ RUN pip3 install \ requests \ packaging -HEALTHCHECK --interval=10s --timeout=10s --start-period=15s \ +HEALTHCHECK --interval=5s --timeout=10s --start-period=5s \ CMD ["/bin/sh", "-c", "/healthcheck.sh"] ENTRYPOINT ["/entrypoint.sh"] diff --git a/lightningd/healthcheck.sh b/lightningd/healthcheck.sh index b214130..3766c35 100755 --- a/lightningd/healthcheck.sh +++ b/lightningd/healthcheck.sh @@ -2,13 +2,4 @@ set -ex -LIGHTNING_NETWORK="" - -case $BITCOIN_CHAIN in - "test") LIGHTNING_NETWORK=testnet ;; - "regtest") LIGHTNING_NETWORK=regtest ;; - "signet") LIGHTNING_NETWORK=signet ;; - *) echo "Invalid BITCOIN_CHAIN value: $BITCOIN_CHAIN" && exit 1 ;; -esac - -lightning-cli --network $LIGHTNING_NETWORK getinfo +lightning-cli --network $VLS_NETWORK summary