chore(release): stage v1.7.54-alpha
This commit is contained in:
@@ -551,7 +551,7 @@ load_spec_archy-lnd-ui() {
|
||||
reset_spec
|
||||
SPEC_NAME="archy-lnd-ui"
|
||||
SPEC_IMAGE="localhost/lnd-ui:local"
|
||||
SPEC_PORTS="8081:80"
|
||||
SPEC_PORTS="18083:80"
|
||||
SPEC_MEMORY="$(mem_limit archy-lnd-ui)"
|
||||
SPEC_TIER="4"
|
||||
SPEC_LOCAL_IMAGE="true"
|
||||
|
||||
@@ -109,8 +109,15 @@ if [ -z "$FRONTEND_ARCHIVE" ]; then
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if [ -f "$PROJECT_ROOT/image-recipe/configs/nginx-archipelago.conf" ]; then
|
||||
mkdir -p "$RUNTIME_DIR/image-recipe/configs"
|
||||
echo " Including runtime nginx-archipelago.conf"
|
||||
cp "$PROJECT_ROOT/image-recipe/configs/nginx-archipelago.conf" \
|
||||
"$RUNTIME_DIR/image-recipe/configs/nginx-archipelago.conf"
|
||||
fi
|
||||
rm -rf "$RUNTIME_DIR/scripts/resilience/reports"
|
||||
find "$RUNTIME_DIR" -type f \( -name '*.bak' -o -name '._*' -o -name '*.log' \) -delete
|
||||
find "$RUNTIME_DIR" -type d -name '__pycache__' -prune -exec rm -rf {} +
|
||||
find "$RUNTIME_DIR" -type f \( -name '*.bak' -o -name '*.bak-*' -o -name '._*' -o -name '*.log' -o -name '*.pyc' \) -delete
|
||||
# Force world-readable perms on every entry BEFORE tar, so the
|
||||
# archive's internal mode bits are 755/644 regardless of what
|
||||
# the staging dir's umask gave us. Without this, mktemp -d
|
||||
|
||||
@@ -944,7 +944,7 @@ LNDCONF
|
||||
fi
|
||||
case \$ui in
|
||||
bitcoin-ui) PORT_ARG=''; NET_ARG='--network host' ;;
|
||||
lnd-ui) PORT_ARG='-p 8081:80'; NET_ARG='' ;;
|
||||
lnd-ui) PORT_ARG='-p 18083:80'; NET_ARG='' ;;
|
||||
electrs-ui) PORT_ARG=''; NET_ARG='--network host' ;;
|
||||
esac
|
||||
if [ -d \"$TARGET_DIR/docker/\$ui\" ]; then
|
||||
|
||||
@@ -1003,14 +1003,14 @@ BUILDINFO_EOF
|
||||
if false; then # Legacy app installation removed — kept for reference in git history
|
||||
progress "Rebuilding LND UI"
|
||||
if ssh $SSH_OPTS "$TARGET_HOST" "cd $TARGET_DIR/docker/lnd-ui && (command -v podman >/dev/null 2>&1 && podman build --no-cache -t lnd-ui:local . || docker build --no-cache -t lnd-ui:local .)" 2>&1 | tail -12 | sed 's/^/ /'; then
|
||||
echo " Recreating LND UI container (port 8081)..."
|
||||
echo " Recreating LND UI container (port 18083)..."
|
||||
ssh $SSH_OPTS "$TARGET_HOST" '
|
||||
DOCKER=podman
|
||||
command -v podman >/dev/null 2>&1 || DOCKER=docker
|
||||
for c in $($DOCKER ps -a --format "{{.Names}}" 2>/dev/null | grep -i lnd-ui); do
|
||||
[ -n "$c" ] && $DOCKER stop "$c" 2>/dev/null; $DOCKER rm -f "$c" 2>/dev/null
|
||||
done
|
||||
$DOCKER run -d --name archy-lnd-ui -p 8081:80 --memory=256m --restart unless-stopped lnd-ui:local
|
||||
$DOCKER run -d --name archy-lnd-ui -p 18083:80 --memory=256m --restart unless-stopped lnd-ui:local
|
||||
' 2>&1 | sed 's/^/ /' || true
|
||||
fi
|
||||
|
||||
|
||||
14
scripts/first-boot-containers.sh
Normal file → Executable file
14
scripts/first-boot-containers.sh
Normal file → Executable file
@@ -464,8 +464,8 @@ done
|
||||
for dir in mempool mysql-mempool; do
|
||||
[ -d "/var/lib/archipelago/$dir" ] && chown -R 100999:100999 "/var/lib/archipelago/$dir" 2>/dev/null
|
||||
done
|
||||
# Grafana: container UID 472 → host UID 100472
|
||||
[ -d /var/lib/archipelago/grafana ] && chown -R 100472:100472 /var/lib/archipelago/grafana 2>/dev/null
|
||||
# Grafana: chown inside podman's user namespace so container UID 472 can write SQLite.
|
||||
[ -d /var/lib/archipelago/grafana ] && podman unshare chown -R 472:472 /var/lib/archipelago/grafana 2>/dev/null || true
|
||||
log "UID mapping done"
|
||||
|
||||
# ── Memory limits per container ──────────────────────────────────────────
|
||||
@@ -995,9 +995,9 @@ track_container "homeassistant"
|
||||
if ! $DOCKER ps --format '{{.Names}}' 2>/dev/null | grep -q grafana; then
|
||||
log "Creating Grafana..."
|
||||
mkdir -p /var/lib/archipelago/grafana
|
||||
chown 472:472 /var/lib/archipelago/grafana 2>/dev/null || true
|
||||
podman unshare chown -R 472:472 /var/lib/archipelago/grafana 2>/dev/null || true
|
||||
$DOCKER run -d --name grafana --restart unless-stopped \
|
||||
--health-cmd="curl -sf http://localhost:3000/api/health || exit 1" --health-interval=120s --health-timeout=5s --health-retries=3 \
|
||||
--health-cmd="test -w /var/lib/grafana && test -w /var/lib/grafana/grafana.db && curl -sf http://localhost:3000/api/health || exit 1" --health-interval=120s --health-timeout=5s --health-retries=3 \
|
||||
--memory=$(mem_limit grafana) \
|
||||
--cap-drop ALL --cap-add CHOWN --cap-add SETUID --cap-add SETGID \
|
||||
--security-opt no-new-privileges:true \
|
||||
@@ -1247,9 +1247,9 @@ for ui in bitcoin-ui lnd-ui electrs-ui; do
|
||||
fi
|
||||
case $ui in
|
||||
# UI containers use --network host so they can proxy to localhost services
|
||||
# Internal nginx ports: bitcoin-ui=8334, electrs-ui=50002, lnd-ui=80 (host 8081)
|
||||
# Internal nginx ports: bitcoin-ui=8334, electrs-ui=50002, lnd-ui=80 (host 18083)
|
||||
bitcoin-ui) PORT_ARG=""; NET_ARG="--network host"; REG_IMG="${BITCOIN_UI_IMAGE}" ;;
|
||||
lnd-ui) PORT_ARG="-p 8081:80"; NET_ARG=""; REG_IMG="${LND_UI_IMAGE}" ;;
|
||||
lnd-ui) PORT_ARG="-p 18083:80"; NET_ARG=""; REG_IMG="${LND_UI_IMAGE}" ;;
|
||||
electrs-ui) PORT_ARG=""; NET_ARG="--network host"; REG_IMG="${ELECTRS_UI_IMAGE}" ;;
|
||||
esac
|
||||
CONTAINER_NAME="archy-$ui"
|
||||
@@ -1284,7 +1284,7 @@ if [ ! -f "$SERVICES_JSON" ]; then
|
||||
cat > "$SERVICES_JSON" <<'SJSON'
|
||||
{"services":[
|
||||
{"name":"archipelago","local_port":80,"enabled":true},
|
||||
{"name":"lnd","local_port":8081,"enabled":true},
|
||||
{"name":"lnd","local_port":18083,"enabled":true},
|
||||
{"name":"btcpay","local_port":23000,"enabled":true},
|
||||
{"name":"mempool","local_port":4080,"enabled":true},
|
||||
{"name":"fedimint","local_port":8175,"enabled":true}
|
||||
|
||||
@@ -7,7 +7,7 @@ Each service gets its own .onion address. Tor runs in a container with host netw
|
||||
| Service | LAN Port | Tor Hidden Service Dir |
|
||||
|-----------|----------|-------------------------------|
|
||||
| Archipelago | 80 | hidden_service_archipelago |
|
||||
| LND UI | 8081 | hidden_service_lnd |
|
||||
| LND UI | 18083 | hidden_service_lnd |
|
||||
| BTCPay | 23000 | hidden_service_btcpay |
|
||||
| Mempool | 4080 | hidden_service_mempool |
|
||||
| Fedimint | 8175 | hidden_service_fedimint |
|
||||
|
||||
Reference in New Issue
Block a user