Browse Source

Pass in APP_DOMAIN

master-prepare
Mayank Chhabra 4 years ago
committed by Luke Childs
parent
commit
e78eec7581
  1. 1
      apps/README.md
  2. 2
      scripts/app

1
apps/README.md

@ -150,6 +150,7 @@ services:
# #
# App specific environment variables # App specific environment variables
# $APP_HIDDEN_SERVICE - The address of the Tor hidden service your app will be exposed at # $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 # If your app has more services, like a database container, you can define those
# services below: # services below:
# db: # db:

2
scripts/app

@ -106,12 +106,14 @@ compose() {
local env_file="${UMBREL_ROOT}/.env" local env_file="${UMBREL_ROOT}/.env"
local app_base_compose_file="${UMBREL_ROOT}/apps/docker-compose.common.yml" local app_base_compose_file="${UMBREL_ROOT}/apps/docker-compose.common.yml"
local app_compose_file="${app_dir}/docker-compose.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_hidden_servive_file="${UMBREL_ROOT}/tor/data/app-${app}/hostname"
local app_entropy_identifier="app-${app}-seed" local app_entropy_identifier="app-${app}-seed"
export BITCOIN_DATA_DIR="${UMBREL_ROOT}/bitcoin" export BITCOIN_DATA_DIR="${UMBREL_ROOT}/bitcoin"
export LND_DATA_DIR="${UMBREL_ROOT}/lnd" export LND_DATA_DIR="${UMBREL_ROOT}/lnd"
export APP_DATA_DIR="${app_data_dir}" 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_HIDDEN_SERVICE="$(cat "${app_hidden_servive_file}" 2>/dev/null || echo "notyetset.onion")"
export APP_SEED=$(derive_entropy "${app_entropy_identifier}") export APP_SEED=$(derive_entropy "${app_entropy_identifier}")

Loading…
Cancel
Save