Browse Source

Add boltz service to ride-the-lightning app (#1123)

Co-authored-by: Luke Childs <lukechilds123@gmail.com>
0.4.10
Michael Henke 3 years ago
committed by GitHub
parent
commit
0c95132bdb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 0
      apps/ride-the-lightning/boltz/.gitkeep
  2. 25
      apps/ride-the-lightning/docker-compose.yml
  3. 2
      scripts/configure
  4. 9
      scripts/update/01-run.sh
  5. 1
      templates/.env-sample

0
apps/ride-the-lightning/boltz/.gitkeep

25
apps/ride-the-lightning/docker-compose.yml

@ -11,6 +11,7 @@ services:
volumes:
- ${APP_DATA_DIR}/rtl:/data
- ${APP_DATA_DIR}/loop:/loop
- ${APP_DATA_DIR}/boltz:/boltz:ro
- ${LND_DATA_DIR}:/lnd:ro
- ${BITCOIN_DATA_DIR}:/bitcoin:ro
entrypoint: /data/entrypoint.sh
@ -30,6 +31,10 @@ services:
# Loop
SWAP_SERVER_URL: "https://$APP_RIDE_THE_LIGHTNING_LOOP_IP:8081"
SWAP_MACAROON_PATH: "/loop/.loop/$BITCOIN_NETWORK"
# Boltz
BOLTZ_SERVER_URL: "https://$APP_RIDE_THE_LIGHTNING_BOLTZ_IP:9003"
BOLTZ_MACAROON_PATH: "/boltz/.boltz-lnd/macaroons"
networks:
default:
ipv4_address: $APP_RIDE_THE_LIGHTNING_IP
@ -53,3 +58,23 @@ services:
networks:
default:
ipv4_address: $APP_RIDE_THE_LIGHTNING_LOOP_IP
boltz:
image: boltz/boltz-lnd:1.2.6@sha256:01a56dd357a2460bfd0ecdd726d6db3ab59d78ee691250831d09ba5de3fec7ce
user: "1000:1000"
restart: "on-failure"
stop_grace_period: "1m"
environment:
HOME: "/data"
volumes:
- "${APP_DATA_DIR}/boltz:/data"
- "${LND_DATA_DIR}:/lnd:ro"
command:
- --lnd.host="$LND_IP"
- --lnd.macaroon="/lnd/data/chain/bitcoin/$BITCOIN_NETWORK/admin.macaroon"
- --lnd.certificate="/lnd/tls.cert"
- --rpc.rest.host="$APP_RIDE_THE_LIGHTNING_BOLTZ_IP"
- --rpc.rest.port="9003"
networks:
default:
ipv4_address: $APP_RIDE_THE_LIGHTNING_BOLTZ_IP

2
scripts/configure

@ -147,6 +147,7 @@ APP_SPHINX_RELAY_PORT="3300"
APP_RIDE_THE_LIGHTNING_IP="10.21.21.15"
APP_RIDE_THE_LIGHTNING_PORT="3001"
APP_RIDE_THE_LIGHTNING_LOOP_IP="10.21.21.16"
APP_RIDE_THE_LIGHTNING_BOLTZ_IP="10.21.21.63"
APP_LIGHTNING_TERMINAL_IP="10.21.21.17"
APP_LIGHTNING_TERMINAL_PORT="3004"
APP_SPECTER_DESKTOP_IP="10.21.21.18"
@ -362,6 +363,7 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
sed -i "s/<app-ride-the-lightning-ip>/${APP_RIDE_THE_LIGHTNING_IP}/g" "${template}"
sed -i "s/<app-ride-the-lightning-port>/${APP_RIDE_THE_LIGHTNING_PORT}/g" "${template}"
sed -i "s/<app-ride-the-lightning-loop-ip>/${APP_RIDE_THE_LIGHTNING_LOOP_IP}/g" "${template}"
sed -i "s/<app-ride-the-lightning-boltz-ip>/${APP_RIDE_THE_LIGHTNING_BOLTZ_IP}/g" "${template}"
sed -i "s/<app-lightning-terminal-ip>/${APP_LIGHTNING_TERMINAL_IP}/g" "${template}"
sed -i "s/<app-lightning-terminal-port>/${APP_LIGHTNING_TERMINAL_PORT}/g" "${template}"
sed -i "s/<app-specter-desktop-ip>/${APP_SPECTER_DESKTOP_IP}/g" "${template}"

9
scripts/update/01-run.sh

@ -243,6 +243,15 @@ if [[ -d "${rtl_data_dir}" ]]; then
cp "${rtl_app_entrypoint}" "${rtl_data_entrypoint}"
fi
# Handle new boltz container for ride-the-lightning app
rtl_data_dir="${UMBREL_ROOT}/app-data/ride-the-lightning"
rtl_boltz_data_dir="${rtl_data_dir}/boltz"
if [[ -d "${rtl_data_dir}" ]] && [[ ! -d "${rtl_boltz_data_dir}" ]]; then
echo "Found ride-the-lightning install without boltz data dir, attempting to create it..."
mkdir "${rtl_boltz_data_dir}"
chown 1000:1000 "${rtl_boltz_data_dir}"
fi
# Handle updating entrypoint for thunderhub app
thunderhub_data_dir="${UMBREL_ROOT}/app-data/thunderhub"
thunderhub_data_entrypoint="${thunderhub_data_dir}/data/entrypoint.sh"

1
templates/.env-sample

@ -41,6 +41,7 @@ APP_SPHINX_RELAY_PORT=<app-sphinx-relay-port>
APP_RIDE_THE_LIGHTNING_IP=<app-ride-the-lightning-ip>
APP_RIDE_THE_LIGHTNING_PORT=<app-ride-the-lightning-port>
APP_RIDE_THE_LIGHTNING_LOOP_IP=<app-ride-the-lightning-loop-ip>
APP_RIDE_THE_LIGHTNING_BOLTZ_IP=<app-ride-the-lightning-boltz-ip>
APP_LIGHTNING_TERMINAL_IP=<app-lightning-terminal-ip>
APP_LIGHTNING_TERMINAL_PORT=<app-lightning-terminal-port>
APP_SPECTER_DESKTOP_IP=<app-specter-desktop-ip>

Loading…
Cancel
Save