From e78eec75810a663773a5ab5174473a0114369641 Mon Sep 17 00:00:00 2001 From: Mayank Chhabra Date: Sat, 24 Jul 2021 00:34:46 +0530 Subject: [PATCH] Pass in APP_DOMAIN --- apps/README.md | 1 + scripts/app | 2 ++ 2 files changed, 3 insertions(+) diff --git a/apps/README.md b/apps/README.md index 9f8e1ec..353f9e2 100644 --- a/apps/README.md +++ b/apps/README.md @@ -150,6 +150,7 @@ services: # # App specific environment variables # $APP_HIDDEN_SERVICE - The address of the Tor hidden service your app will be exposed at + # $APP_DOMAIN - Local domain name of the app ("umbrel.local" on Umbrel OS) # If your app has more services, like a database container, you can define those # services below: # db: diff --git a/scripts/app b/scripts/app index 16f32fb..0a91903 100755 --- a/scripts/app +++ b/scripts/app @@ -106,12 +106,14 @@ compose() { local env_file="${UMBREL_ROOT}/.env" local app_base_compose_file="${UMBREL_ROOT}/apps/docker-compose.common.yml" local app_compose_file="${app_dir}/docker-compose.yml" + local app_domain="$(hostname -s 2>/dev/null || echo "umbrel").local" local app_hidden_servive_file="${UMBREL_ROOT}/tor/data/app-${app}/hostname" local app_entropy_identifier="app-${app}-seed" export BITCOIN_DATA_DIR="${UMBREL_ROOT}/bitcoin" export LND_DATA_DIR="${UMBREL_ROOT}/lnd" export APP_DATA_DIR="${app_data_dir}" + export APP_DOMAIN="${app_domain}" export APP_HIDDEN_SERVICE="$(cat "${app_hidden_servive_file}" 2>/dev/null || echo "notyetset.onion")" export APP_SEED=$(derive_entropy "${app_entropy_identifier}")