mirror of
https://github.com/getumbrel/umbrel-apps.git
synced 2026-11-21 13:34:26 +03:00
Make Fulcrum interchangeable with other Electrum Server re-implementations
This commit is contained in:
1 parent
b591033921
commit
ead4591fd3
5 files changed
+40
-10
No files matched your search
Whitespace-only changes.
@@ -7,20 +7,21 @@ services:
|
||||
APP_PORT: 3006
|
||||
|
||||
app:
|
||||
image: ghcr.io/sahilph/umbrel-fulcrum:sha-349e246@sha256:5d565f3b15f7bbeab28c027320ffc84d647e7816cd007fd84077c0db05c15393
|
||||
image: nmfretz/umbrel-fulcrum:1.0.0@sha256:fd8a45f757e11ae1526b650ee5179d25f469d9b371163466fead08c70aab9d41
|
||||
depends_on:
|
||||
- fulcrum
|
||||
restart: on-failure
|
||||
environment:
|
||||
ELECTRUM_HIDDEN_SERVICE: "${APP_FULCRUM_RPC_HIDDEN_SERVICE}"
|
||||
ELECTRUM_LOCAL_SERVICE: "${DEVICE_DOMAIN_NAME}"
|
||||
ELECTRUM_PORT: ${APP_FULCRUM_NODE_PORT}
|
||||
FULCRUM_HOST: "${APP_FULCRUM_NODE_IP}"
|
||||
FULCRUM_PORT: "${APP_FULCRUM_NODE_PORT}"
|
||||
ELECTRUM_HOST: "${APP_FULCRUM_NODE_IP}"
|
||||
ELECTRUM_PUBLIC_CONNECTION_PORT: ${APP_FULCRUM_NODE_PORT}
|
||||
BITCOIN_HOST: "${APP_BITCOIN_NODE_IP}"
|
||||
RPC_USER: "${APP_BITCOIN_RPC_USER}"
|
||||
RPC_PASSWORD: "${APP_BITCOIN_RPC_PASS}"
|
||||
RPC_PORT: "${APP_BITCOIN_RPC_PORT}"
|
||||
volumes:
|
||||
- "${APP_DATA_DIR}/data/fulcrum-logs:/fulcrum-logs"
|
||||
networks:
|
||||
default:
|
||||
ipv4_address: $APP_FULCRUM_IP
|
||||
@@ -31,14 +32,16 @@ services:
|
||||
user: "1000:1000"
|
||||
environment:
|
||||
TCP: 0.0.0.0:${APP_FULCRUM_NODE_PORT}
|
||||
ADMIN: 0.0.0.0:${APP_FULCRUM_ADMIN_PORT}
|
||||
BITCOIND: ${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_RPC_PORT}
|
||||
RPCUSER: ${APP_BITCOIN_RPC_USER}
|
||||
RPCPASSWORD: ${APP_BITCOIN_RPC_PASS}
|
||||
PEERING: "false"
|
||||
ANNOUNCE: "false"
|
||||
command: Fulcrum _ENV_
|
||||
command: sh -c 'Fulcrum -D /data _ENV_ 2>&1 | tee /logs/fulcrum.log'
|
||||
volumes:
|
||||
- "${APP_DATA_DIR}/data/fulcrum:/data"
|
||||
- "${APP_DATA_DIR}/data/fulcrum-logs:/logs"
|
||||
ports:
|
||||
- "${APP_FULCRUM_NODE_PORT}:${APP_FULCRUM_NODE_PORT}"
|
||||
networks:
|
||||
|
||||
@@ -2,6 +2,21 @@ export APP_FULCRUM_IP="10.21.22.200"
|
||||
export APP_FULCRUM_NODE_IP="10.21.21.200"
|
||||
|
||||
export APP_FULCRUM_NODE_PORT="50002"
|
||||
export APP_FULCRUM_ADMIN_PORT="8000"
|
||||
|
||||
for var in \
|
||||
IP \
|
||||
NODE_IP \
|
||||
NODE_PORT \
|
||||
; do
|
||||
electrs_var="APP_ELECTRS_${var}"
|
||||
fulcrum_var="APP_FULCRUM_${var}"
|
||||
if [ -n "${!fulcrum_var-}" ]; then
|
||||
export "$electrs_var"="${!electrs_var:=${!fulcrum_var}}"
|
||||
else
|
||||
echo "Warning: $fulcrum_var is unset or empty"
|
||||
fi
|
||||
done
|
||||
|
||||
rpc_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-rpc/hostname"
|
||||
export APP_FULCRUM_RPC_HIDDEN_SERVICE="$(cat "${rpc_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
|
||||
Regular → Executable
+6
@@ -1,5 +1,11 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# If ${APP_DATA_DIR}/data/fulcrum-logs doesn't exist, we create it and set 1000:1000 ownership
|
||||
if [[ ! -d "${APP_DATA_DIR}/data/fulcrum-logs" ]]; then
|
||||
mkdir -p "${APP_DATA_DIR}/data/fulcrum-logs"
|
||||
chown 1000:1000 "${APP_DATA_DIR}/data/fulcrum-logs"
|
||||
fi
|
||||
|
||||
# Delay booting Fulcrum until the RPC Tor Hidden Service is ready
|
||||
|
||||
HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-rpc/hostname"
|
||||
|
||||
+11
-5
@@ -1,8 +1,10 @@
|
||||
manifestVersion: 1.1
|
||||
id: fulcrum
|
||||
implements:
|
||||
- electrs
|
||||
category: bitcoin
|
||||
name: Fulcrum
|
||||
version: "1.11.1"
|
||||
version: "1.11.1-swappable"
|
||||
tagline: A fast and nimble Electrum Server
|
||||
description: >-
|
||||
Run your personal Electrum server and connect your Electrum-compatible wallet,
|
||||
@@ -12,9 +14,6 @@ description: >-
|
||||
|
||||
|
||||
Powered by Fulcrum from Calin Culianu
|
||||
|
||||
|
||||
⚠️ Fulcrum does not yet automatically integrate with other apps in the Bitcoin ecosystem on Umbrel. However, in a future umbrelOS update, users will be able to choose which Electrum Server app they want to use to connect with other apps.
|
||||
developer: Calin Culianu
|
||||
website: https://fulcrumserver.org/
|
||||
submitter: Sahil Phule
|
||||
@@ -30,4 +29,11 @@ gallery:
|
||||
- 3.jpg
|
||||
path: ""
|
||||
defaultPassword: ""
|
||||
releaseNotes: ""
|
||||
releaseNotes: >-
|
||||
Fulcrum now integrates seamlessly with other apps, allowing you to connect to compatible apps like Bitcoin nodes and block explorers.
|
||||
|
||||
|
||||
To switch an existing app to connect to Fulcrum, right-click the app and update the connection in “Settings.”
|
||||
|
||||
|
||||
⚠️ Note: This feature requires umbrelOS 1.3 or later.
|
||||
Reference in new issue
Block a user