diff --git a/bitcoin-knots/docker-compose.yml b/bitcoin-knots/docker-compose.yml index d0aa98f..72f3653 100644 --- a/bitcoin-knots/docker-compose.yml +++ b/bitcoin-knots/docker-compose.yml @@ -7,7 +7,7 @@ services: APP_PORT: 3005 server: - image: retropexx/umbrel-bitcoin-knots:v0.5.0@sha256:ed708145a3deb5edd3058d087ab973ac84a280ca0cafcf2c2bfa414e00e20dc7 + image: retropexx/umbrel-bitcoin-knots:v0.5.0@sha256:b19da8308ec9b6c66511d327f5fd2b64aa430a3da8ed3854e8e170274b11b624 depends_on: [bitcoind] restart: on-failure volumes: @@ -16,8 +16,8 @@ services: environment: PORT: "3005" BITCOIN_HOST: "${APP_BITCOIN_NODE_IP}" - RPC_PORT: "${APP_BITCOIN_RPC_PORT}" - BITCOIN_RPC_PORT: "${APP_BITCOIN_RPC_PORT}" + RPC_PORT: "${APP_BITCOIN_INTERNAL_RPC_PORT}" + BITCOIN_RPC_PORT: "${APP_BITCOIN_INTERNAL_RPC_PORT}" RPC_USER: "${APP_BITCOIN_RPC_USER}" BITCOIN_RPC_USER: "${APP_BITCOIN_RPC_USER}" RPC_PASSWORD: "${APP_BITCOIN_RPC_PASS}" @@ -40,15 +40,15 @@ services: ipv4_address: $APP_BITCOIN_IP bitcoind: - image: retropexx/bitcoind:v25.1@sha256:1da8c09858d0c19df5f821de27e42692c7193291fcc68fff004a5fbdd7f7454f + image: retropexx/bitcoind:v25.1@sha256:4091eb570744d24f4234a0efc6d8b6aaf7de1c86d1a6e3077525d59bbd98336e command: "${APP_BITCOIN_COMMAND}" restart: unless-stopped stop_grace_period: 15m30s volumes: - "${APP_BITCOIN_DATA_DIR}:/data/.bitcoin" ports: - - "${APP_BITCOIN_P2P_PORT}:${APP_BITCOIN_P2P_PORT}" - - "${APP_BITCOIN_RPC_PORT}:${APP_BITCOIN_RPC_PORT}" + - "${APP_BITCOIN_P2P_PORT}:${APP_BITCOIN_INTERNAL_P2P_PORT}" + - "${APP_BITCOIN_RPC_PORT}:${APP_BITCOIN_INTERNAL_RPC_PORT}" networks: default: ipv4_address: $APP_BITCOIN_NODE_IP diff --git a/bitcoin-knots/exports.sh b/bitcoin-knots/exports.sh index 08a832a..6932be8 100644 --- a/bitcoin-knots/exports.sh +++ b/bitcoin-knots/exports.sh @@ -1,16 +1,19 @@ -export APP_BITCOIN_IP="10.21.22.2" -export APP_BITCOIN_NODE_IP="10.21.21.8" -export APP_BITCOIN_TOR_PROXY_IP="10.21.22.10" -export APP_BITCOIN_I2P_DAEMON_IP="10.21.22.11" +export APP_BITCOIN_IP="10.21.22.3" +export APP_BITCOIN_NODE_IP="10.21.21.9" +export APP_BITCOIN_TOR_PROXY_IP="10.21.22.12" +export APP_BITCOIN_I2P_DAEMON_IP="10.21.22.13" export APP_BITCOIN_DATA_DIR="${EXPORTS_APP_DIR}/data/bitcoin" -export APP_BITCOIN_RPC_PORT="8332" -export APP_BITCOIN_P2P_PORT="8333" -export APP_BITCOIN_TOR_PORT="8334" -export APP_BITCOIN_ZMQ_RAWBLOCK_PORT="28332" -export APP_BITCOIN_ZMQ_RAWTX_PORT="28333" -export APP_BITCOIN_ZMQ_HASHBLOCK_PORT="28334" -export APP_BITCOIN_ZMQ_SEQUENCE_PORT="28335" +export APP_BITCOIN_RPC_PORT="9332" +export APP_BITCOIN_P2P_PORT="9333" +export APP_BITCOIN_TOR_PORT="9334" +export APP_BITCOIN_ZMQ_RAWBLOCK_PORT="48332" +export APP_BITCOIN_ZMQ_RAWTX_PORT="48333" +export APP_BITCOIN_ZMQ_HASHBLOCK_PORT="48334" +export APP_BITCOIN_ZMQ_SEQUENCE_PORT="48335" +export APP_BITCOIN_INTERNAL_RPC_PORT="8332" +export APP_BITCOIN_INTERNAL_P2P_PORT="8333" +export APP_BITCOIN_INTERNAL_tor_PORT="8334" BITCOIN_CHAIN="main" BITCOIN_ENV_FILE="${EXPORTS_APP_DIR}/.env" diff --git a/bitcoin-knots/umbrel-app.yml b/bitcoin-knots/umbrel-app.yml index 1f590f4..93786b0 100644 --- a/bitcoin-knots/umbrel-app.yml +++ b/bitcoin-knots/umbrel-app.yml @@ -1,10 +1,13 @@ manifestVersion: 1.1 -id: bitcoin +id: bitcoin-knots category: bitcoin name: Bitcoin Knots version: "25.1" tagline: Run your personal node powered by Bitcoin Knots description: >- + Bitcoin Knots will be compatible with all apps that need Bitcoin Core in a future umbrel update. + + Run your Bitcoin node and independently store and validate every single Bitcoin transaction with it. Achieve unparalleled privacy by connecting your wallet directly to your node to @@ -29,7 +32,7 @@ website: https://bitcoinknots.org dependencies: [] repo: https://github.com/bitcoinknots/bitcoin.git support: https://github.com/bitcoinknots/bitcoin/issues -port: 2100 +port: 2101 gallery: - 1.jpg - 2.jpg @@ -53,4 +56,4 @@ releaseNotes: >- Read the full release notes for additional information and detailed changes at https://github.com/bitcoinknots/bitcoin/blob/v25.1.knots20231115/doc/release-notes.md submitter: Léo Haf -submission: to update. +submission: https://github.com/getumbrel/umbrel-apps/pull/953