mirror of
https://github.com/getumbrel/umbrel-apps.git
synced 2026-11-21 13:34:26 +03:00
- replace every app-owned `getumbrel/tor:0.4.7.8` reference with `ghcr.io/getumbrel/tor:0.4.9.11` - pin the public multiarch manifest list at `sha256:e382b8629c0dfef6ceb396b062622d4e4e955b19d6f16b883fd2c0723ad5671a` - bump each affected package using `-patch.N` notation so existing installations are offered the update without implying an upstream app-version bump - add Tor security/connectivity release notes while retaining prior upgrade warnings for users who skip releases Affected apps: Bitcoin Knots, Bitcoin Node, Blockstream Blind Oracle, Core Lightning, Electrs, ElectrumX, Elements Core, Fulcrum, Libre Relay, Lightning Node, Monero Node, Samourai Server, Squeaknode, Suredbits Wallet, and TDEX Provider. These packages still use Tor 0.4.7.8, which is EOL and can no longer reliably bootstrap against the current Tor network. Tor 0.4.9.11 is the current stable security patch release. The replacement image preserves Umbrel's existing `tor` entrypoint and supports both linux/amd64 and linux/arm64.
87 lines
3.8 KiB
YAML
87 lines
3.8 KiB
YAML
version: "3.7"
|
|
|
|
services:
|
|
app_proxy:
|
|
environment:
|
|
APP_HOST: $APP_BITCOIN_NODE_IP
|
|
APP_PORT: 3000
|
|
|
|
app:
|
|
image: ghcr.io/getumbrel/umbrel-bitcoin:v1.3.0@sha256:a684213f37985b987c07a4d10cc9d04396eb2eb2a25f6b210052bb102950d7fe
|
|
user: "1000:1000"
|
|
restart: on-failure
|
|
stop_grace_period: 15m30s
|
|
# these ports are exposed for external connections to bitcoind
|
|
ports:
|
|
- "${APP_BITCOIN_P2P_PORT}:${APP_BITCOIN_P2P_PORT}"
|
|
- "${APP_BITCOIN_RPC_PORT}:${APP_BITCOIN_RPC_PORT}"
|
|
volumes:
|
|
- ${APP_DATA_DIR}/data:/data # data/app and data/bitcoin
|
|
environment:
|
|
# DATA DIRECTORY SETTINGS
|
|
# BITCOIN_DIR: bitcoin-dir-override
|
|
# APP_STATE_DIR: app-state-dir-override
|
|
|
|
# BITCOIN CORE BINARY SETTINGS
|
|
# BITCOIND_BIN: bitcoind-binary-path-override
|
|
# BITCOIN_BIN: bitcoin-wrapper-binary-path-override
|
|
# BITCOIND_EXTRA_ARGS is a comma-delimited list of extra startup flags to pass to Bitcoin Core
|
|
# We can remove deprecatedrpc=create_bdb in a future update once Jam (JoinMarket) implements descriptor wallet support
|
|
# Bitcoin Core v30 no longer supports legacy bdb wallets, so Jam users will need to run v29.2 for compatibility
|
|
BITCOIND_EXTRA_ARGS: '-deprecatedrpc=create_bdb'
|
|
|
|
# BITCOIND CONF FILE SETTINGS
|
|
APPS_SUBNET: "${NETWORK_IP}/16" # used for rpcallowip
|
|
P2P_PORT: "${APP_BITCOIN_P2P_PORT}" # port, bind (also used for connect details)
|
|
P2P_WHITEBIND_PORT: "${APP_BITCOIN_P2P_WHITEBIND_PORT}" # Additional inbound P2P listener granting whitelisted permissions (whitebind) to this port; for trusted internal apps only; do not publish externally
|
|
RPC_PORT: "${APP_BITCOIN_RPC_PORT}" # rpcport (also used for rpc client and connect details)
|
|
TOR_PORT: "${APP_BITCOIN_TOR_PORT}" # bind=onion
|
|
ZMQ_RAWBLOCK_PORT: "${APP_BITCOIN_ZMQ_RAWBLOCK_PORT}" # zmqpubrawblock
|
|
ZMQ_RAWTX_PORT: "${APP_BITCOIN_ZMQ_RAWTX_PORT}" # zmqpubrawtx
|
|
ZMQ_HASHBLOCK_PORT: "${APP_BITCOIN_ZMQ_HASHBLOCK_PORT}" # zmqpubhashblock
|
|
ZMQ_SEQUENCE_PORT: "${APP_BITCOIN_ZMQ_SEQUENCE_PORT}" # zmqpubsequence
|
|
ZMQ_HASHTX_PORT: "${APP_BITCOIN_ZMQ_HASHTX_PORT}" # zmqpubhashtx
|
|
TOR_HOST: "${APP_BITCOIN_TOR_PROXY_IP}" # proxy, onion, torcontrol
|
|
TOR_SOCKS_PORT: "9050" # proxy, onion
|
|
TOR_CONTROL_PORT: "9051" # torcontrol
|
|
TOR_CONTROL_PASSWORD: "moneyprintergobrrr" # torpassword
|
|
I2P_HOST: "${APP_BITCOIN_I2P_DAEMON_IP}" # i2psam
|
|
I2P_SAM_PORT: "7656" # i2psam
|
|
|
|
# RPC CLIENT SETTINGS
|
|
BITCOIND_IP: "${APP_BITCOIN_NODE_IP}" # host for the rpc client. Also used for bitcoind conf file rpcbind & bind.
|
|
RPC_USER: "${APP_BITCOIN_RPC_USER}" # also shown in the connect modal
|
|
RPC_PASS: "${APP_BITCOIN_RPC_PASS}" # also shown in the connect modal
|
|
|
|
# CONNECTION DETAILS (shown to user in the connect modal)
|
|
DEVICE_DOMAIN_NAME: "${DEVICE_DOMAIN_NAME}"
|
|
P2P_HIDDEN_SERVICE: "${APP_BITCOIN_P2P_HIDDEN_SERVICE}"
|
|
RPC_HIDDEN_SERVICE: "${APP_BITCOIN_RPC_HIDDEN_SERVICE}"
|
|
networks:
|
|
default:
|
|
ipv4_address: $APP_BITCOIN_NODE_IP
|
|
|
|
tor:
|
|
image: ghcr.io/getumbrel/tor:0.4.9.11@sha256:e382b8629c0dfef6ceb396b062622d4e4e955b19d6f16b883fd2c0723ad5671a
|
|
user: "1000:1000"
|
|
restart: on-failure
|
|
volumes:
|
|
- ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro
|
|
- ${TOR_DATA_DIR}:/data
|
|
environment:
|
|
HOME: "/tmp"
|
|
networks:
|
|
default:
|
|
ipv4_address: "${APP_BITCOIN_TOR_PROXY_IP}"
|
|
|
|
i2pd_daemon:
|
|
image: purplei2p/i2pd:release-2.59.0@sha256:257653c18ce0b127ef480e3d8373b3ddbf1495e842674c8cfc59909be0015979
|
|
user: "root"
|
|
command: --sam.enabled=true --sam.address=0.0.0.0 --sam.port=7656 --loglevel=error
|
|
restart: on-failure
|
|
volumes:
|
|
- ${APP_DATA_DIR}/data/i2pd:/home/i2pd/data
|
|
networks:
|
|
default:
|
|
ipv4_address: "${APP_BITCOIN_I2P_DAEMON_IP}"
|