From fea04b09ba44a49d4c616af8682e78414f76e1d7 Mon Sep 17 00:00:00 2001 From: Steven Briscoe Date: Mon, 16 May 2022 15:30:51 +0200 Subject: [PATCH] Add support for app proxy for all apps --- agora/docker-compose.yml | 7 +++++-- agora/torrc.template | 3 --- agora/umbrel-app.yml | 2 +- bitfeed/docker-compose.yml | 7 +++++-- bitfeed/torrc.template | 3 --- bitfeed/umbrel-app.yml | 2 +- bleskomat-server/docker-compose.yml | 6 ++++-- bleskomat-server/torrc.template | 3 --- bleskomat-server/umbrel-app.yml | 2 +- bluewallet/docker-compose.yml | 7 +++++-- bluewallet/torrc.template | 2 -- bluewallet/umbrel-app.yml | 2 +- btc-rpc-explorer/docker-compose.yml | 7 +++++-- btc-rpc-explorer/torrc.template | 3 --- btc-rpc-explorer/umbrel-app.yml | 2 +- btcpay-server/docker-compose.yml | 7 +++++-- btcpay-server/torrc.template | 3 --- btcpay-server/umbrel-app.yml | 2 +- code-server/docker-compose.yml | 7 +++++-- code-server/torrc.template | 3 --- code-server/umbrel-app.yml | 2 +- electrumx/docker-compose.yml | 7 +++++-- element/docker-compose.yml | 7 +++++-- element/torrc.template | 3 --- element/umbrel-app.yml | 2 +- gitea/docker-compose.yml | 7 ++++++- gitea/umbrel-app.yml | 2 +- helipad/docker-compose.yml | 7 +++++-- helipad/torrc.template | 3 --- helipad/umbrel-app.yml | 2 +- home-assistant/docker-compose.yml | 7 +++++-- home-assistant/torrc.template | 3 --- home-assistant/umbrel-app.yml | 2 +- itchysats/docker-compose.yml | 7 +++++-- itchysats/torrc.template | 3 --- itchysats/umbrel-app.yml | 2 +- jam/docker-compose.yml | 7 +++++-- jam/torrc.template | 3 --- jam/umbrel-app.yml | 2 +- kollider/docker-compose.yml | 6 ++++-- kollider/umbrel-app.yml | 2 +- krystal-bull/docker-compose.yml | 6 ++++-- krystal-bull/torrc.template | 3 --- krystal-bull/umbrel-app.yml | 2 +- lightning-shell/docker-compose.yml | 6 ++++-- lightning-shell/torrc.template | 3 --- lightning-shell/umbrel-app.yml | 2 +- lightning-terminal/docker-compose.yml | 7 +++++-- lightning-terminal/torrc.template | 3 --- lightning-terminal/umbrel-app.yml | 2 +- lnbits/docker-compose.yml | 6 ++++-- lnbits/torrc.template | 3 --- lnbits/umbrel-app.yml | 2 +- lndg/docker-compose.yml | 7 +++++-- lndg/torrc.template | 3 --- lndg/umbrel-app.yml | 2 +- lnmarkets/docker-compose.yml | 6 ++++-- lnmarkets/torrc.template | 3 --- lnmarkets/umbrel-app.yml | 2 +- mempool/docker-compose.yml | 6 ++++-- mempool/torrc.template | 3 --- mempool/umbrel-app.yml | 2 +- nextcloud/docker-compose.yml | 6 ++++-- nextcloud/torrc.template | 3 --- nextcloud/umbrel-app.yml | 2 +- node-red/docker-compose.yml | 6 ++++-- node-red/torrc.template | 3 --- node-red/umbrel-app.yml | 2 +- photoprism/docker-compose.yml | 6 ++++-- photoprism/torrc.template | 3 --- photoprism/umbrel-app.yml | 2 +- pi-hole/docker-compose.yml | 5 ++++- pi-hole/torrc.template | 3 --- pi-hole/umbrel-app.yml | 2 +- ride-the-lightning/docker-compose.yml | 6 ++++-- ride-the-lightning/torrc.template | 3 --- ride-the-lightning/umbrel-app.yml | 2 +- samourai-server/docker-compose.yml | 5 ++++- samourai-server/exports.sh | 4 ++-- samourai-server/umbrel-app.yml | 2 +- satsale/docker-compose.yml | 6 ++++-- satsale/torrc.template | 3 --- satsale/umbrel-app.yml | 2 +- simple-torrent/docker-compose.yml | 7 +++++-- simple-torrent/torrc.template | 3 --- simple-torrent/umbrel-app.yml | 2 +- snowflake/docker-compose.yml | 7 +++++-- snowflake/torrc.template | 3 --- snowflake/umbrel-app.yml | 2 +- sparkkiosk/docker-compose.yml | 7 +++++-- sparkkiosk/torrc.template | 3 --- sparkkiosk/umbrel-app.yml | 2 +- specter-desktop/docker-compose.yml | 7 +++++-- specter-desktop/torrc.template | 3 --- specter-desktop/umbrel-app.yml | 2 +- sphinx-relay/docker-compose.yml | 7 +++++-- sphinx-relay/umbrel-app.yml | 2 +- squeaknode/docker-compose.yml | 6 +++++- squeaknode/exports.sh | 5 ++++- squeaknode/umbrel-app.yml | 2 +- suredbits-wallet/docker-compose.yml | 8 ++++++-- suredbits-wallet/exports.sh | 5 ++++- suredbits-wallet/umbrel-app.yml | 2 +- synapse/docker-compose.yml | 7 +++++-- synapse/umbrel-app.yml | 2 +- syncthing/docker-compose.yml | 6 +++++- syncthing/torrc.template | 3 --- syncthing/umbrel-app.yml | 2 +- tailscale/docker-compose.yml | 6 ++++++ tailscale/torrc.template | 3 --- tailscale/umbrel-app.yml | 2 +- tallycoin-connect/docker-compose.yml | 7 +++++-- tallycoin-connect/torrc.template | 3 --- tallycoin-connect/umbrel-app.yml | 2 +- thunderhub/docker-compose.yml | 7 +++++-- thunderhub/torrc.template | 3 --- thunderhub/umbrel-app.yml | 2 +- uptime-kuma/docker-compose.yml | 7 +++++-- uptime-kuma/torrc.template | 3 --- uptime-kuma/umbrel-app.yml | 2 +- urbit-bitcoin-connector/docker-compose.yml | 6 +++++- urbit-bitcoin-connector/torrc.template | 3 --- urbit-bitcoin-connector/umbrel-app.yml | 2 +- urbit/docker-compose.yml | 6 +++++- urbit/umbrel-app.yml | 2 +- usocial/docker-compose.yml | 8 ++++++-- usocial/torrc.template | 3 --- usocial/umbrel-app.yml | 2 +- vaultwarden/docker-compose.yml | 7 +++++-- vaultwarden/torrc.template | 3 --- vaultwarden/umbrel-app.yml | 2 +- 131 files changed, 275 insertions(+), 242 deletions(-) delete mode 100644 agora/torrc.template delete mode 100644 bitfeed/torrc.template delete mode 100644 bleskomat-server/torrc.template delete mode 100644 bluewallet/torrc.template delete mode 100644 btc-rpc-explorer/torrc.template delete mode 100644 btcpay-server/torrc.template delete mode 100644 code-server/torrc.template delete mode 100644 element/torrc.template delete mode 100644 helipad/torrc.template delete mode 100644 home-assistant/torrc.template delete mode 100644 itchysats/torrc.template delete mode 100644 jam/torrc.template delete mode 100644 krystal-bull/torrc.template delete mode 100644 lightning-shell/torrc.template delete mode 100644 lightning-terminal/torrc.template delete mode 100644 lnbits/torrc.template delete mode 100644 lndg/torrc.template delete mode 100644 lnmarkets/torrc.template delete mode 100644 mempool/torrc.template delete mode 100644 nextcloud/torrc.template delete mode 100644 node-red/torrc.template delete mode 100644 photoprism/torrc.template delete mode 100644 pi-hole/torrc.template delete mode 100644 ride-the-lightning/torrc.template delete mode 100644 satsale/torrc.template delete mode 100644 simple-torrent/torrc.template delete mode 100644 snowflake/torrc.template delete mode 100644 sparkkiosk/torrc.template delete mode 100644 specter-desktop/torrc.template delete mode 100644 syncthing/torrc.template delete mode 100644 tailscale/torrc.template delete mode 100644 tallycoin-connect/torrc.template delete mode 100644 thunderhub/torrc.template delete mode 100644 uptime-kuma/torrc.template delete mode 100644 urbit-bitcoin-connector/torrc.template delete mode 100644 usocial/torrc.template delete mode 100644 vaultwarden/torrc.template diff --git a/agora/docker-compose.yml b/agora/docker-compose.yml index 0d79268..4960e6c 100644 --- a/agora/docker-compose.yml +++ b/agora/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_AGORA_IP + APP_PORT: 80 + filebrowser: image: filebrowser/filebrowser:v2.21.1@sha256:e1f43b1b8a1acb1d7cd5f934454e7a2ef571ea3bab48b0e1ed0fa97ef9df8d69 user: 1000:1000 @@ -50,8 +55,6 @@ services: NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx/ APP_AGORA_SERVER_IP: $APP_AGORA_SERVER_IP APP_AGORA_FILEBROWSER_IP: $APP_AGORA_FILEBROWSER_IP - ports: - - "$APP_AGORA_PORT:80" depends_on: - agora - filebrowser diff --git a/agora/torrc.template b/agora/torrc.template deleted file mode 100644 index 6ffe020..0000000 --- a/agora/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# agora Hidden Service -HiddenServiceDir /data/app-agora -HiddenServicePort 80 $APP_AGORA_IP:80 \ No newline at end of file diff --git a/agora/umbrel-app.yml b/agora/umbrel-app.yml index ff26a62..29a5efe 100644 --- a/agora/umbrel-app.yml +++ b/agora/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: agora category: Files name: Agora diff --git a/bitfeed/docker-compose.yml b/bitfeed/docker-compose.yml index 7519aa8..19514c3 100644 --- a/bitfeed/docker-compose.yml +++ b/bitfeed/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_BITFEED_IP + APP_PORT: 80 + web: image: ghcr.io/bitfeed-project/bitfeed-client:v2.2.1@sha256:70c89d49d20ba3da21c648c259f45a4b89e06bfe1d97374a092dce6f891d03c6 restart: on-failure @@ -11,8 +16,6 @@ services: TARGET: "umbrel" BACKEND_HOST: "$APP_BITFEED_API_IP" BACKEND_PORT: "$APP_BITFEED_API_PORT" - ports: - - "$APP_BITFEED_PORT:80" networks: default: ipv4_address: $APP_BITFEED_IP diff --git a/bitfeed/torrc.template b/bitfeed/torrc.template deleted file mode 100644 index 4e94074..0000000 --- a/bitfeed/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# bitfeed Hidden Service -HiddenServiceDir /data/app-bitfeed -HiddenServicePort 80 $APP_BITFEED_IP:80 \ No newline at end of file diff --git a/bitfeed/umbrel-app.yml b/bitfeed/umbrel-app.yml index 1bc4e11..4db2a5a 100644 --- a/bitfeed/umbrel-app.yml +++ b/bitfeed/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: bitfeed category: Explorers name: Bitfeed diff --git a/bleskomat-server/docker-compose.yml b/bleskomat-server/docker-compose.yml index 2e8e819..e07a8a7 100644 --- a/bleskomat-server/docker-compose.yml +++ b/bleskomat-server/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_BLESKOMAT_SERVER_IP + APP_PORT: $APP_BLESKOMAT_SERVER_PORT db: image: postgres:10.20-stretch@sha256:130e08bb19199bd055e585e8938c5ebb0555dc13b445fad5b0bd727e4b75149c @@ -24,8 +28,6 @@ services: stop_grace_period: 1m depends_on: - db - ports: - - "$APP_BLESKOMAT_SERVER_PORT:$APP_BLESKOMAT_SERVER_PORT" volumes: - $APP_DATA_DIR/data/web:/usr/src/app/data - $LND_DATA_DIR:/lnd:ro diff --git a/bleskomat-server/torrc.template b/bleskomat-server/torrc.template deleted file mode 100644 index a36b28c..0000000 --- a/bleskomat-server/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# bleskomat-server Hidden Service -HiddenServiceDir /data/app-bleskomat-server -HiddenServicePort 80 $APP_BLESKOMAT_SERVER_IP:$APP_BLESKOMAT_SERVER_PORT \ No newline at end of file diff --git a/bleskomat-server/umbrel-app.yml b/bleskomat-server/umbrel-app.yml index e425d54..bce8ace 100644 --- a/bleskomat-server/umbrel-app.yml +++ b/bleskomat-server/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: bleskomat-server category: Wallet Servers name: Bleskomat Server diff --git a/bluewallet/docker-compose.yml b/bluewallet/docker-compose.yml index fad0ee6..024c40a 100644 --- a/bluewallet/docker-compose.yml +++ b/bluewallet/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_BLUEWALLET_LNDHUB_IP + APP_PORT: $APP_BLUEWALLET_LNDHUB_PORT + redis: image: "redis:6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396" user: "1000:1000" @@ -21,8 +26,6 @@ services: restart: "on-failure" stop_grace_period: "1m" init: true - ports: - - "${APP_BLUEWALLET_LNDHUB_PORT}:${APP_BLUEWALLET_LNDHUB_PORT}" volumes: - "${LND_DATA_DIR}:/lnd:ro" environment: diff --git a/bluewallet/torrc.template b/bluewallet/torrc.template deleted file mode 100644 index 89d1bec..0000000 --- a/bluewallet/torrc.template +++ /dev/null @@ -1,2 +0,0 @@ -HiddenServiceDir /data/app-bluewallet -HiddenServicePort 80 $APP_BLUEWALLET_LNDHUB_IP:$APP_BLUEWALLET_LNDHUB_PORT \ No newline at end of file diff --git a/bluewallet/umbrel-app.yml b/bluewallet/umbrel-app.yml index 2f8b61d..b5ff73e 100644 --- a/bluewallet/umbrel-app.yml +++ b/bluewallet/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: bluewallet category: Wallet Servers name: BlueWallet Lightning diff --git a/btc-rpc-explorer/docker-compose.yml b/btc-rpc-explorer/docker-compose.yml index a5f37f0..6b22fe8 100644 --- a/btc-rpc-explorer/docker-compose.yml +++ b/btc-rpc-explorer/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_BTC_RPC_EXPLORER_IP + APP_PORT: $APP_BTC_RPC_EXPLORER_PORT + web: image: getumbrel/btc-rpc-explorer:v3.3.0@sha256:cfd14f8e722cfbf1ad106ba224569c8babe685422461a641abc210e13913c636 restart: on-failure stop_grace_period: 1m - ports: - - "$APP_BTC_RPC_EXPLORER_PORT:$APP_BTC_RPC_EXPLORER_PORT" environment: # Docker requirements BTCEXP_HOST: 0.0.0.0 diff --git a/btc-rpc-explorer/torrc.template b/btc-rpc-explorer/torrc.template deleted file mode 100644 index 24ab2ee..0000000 --- a/btc-rpc-explorer/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# btc-rpc-explorer Hidden Service -HiddenServiceDir /data/app-btc-rpc-explorer -HiddenServicePort 80 $APP_BTC_RPC_EXPLORER_IP:$APP_BTC_RPC_EXPLORER_PORT \ No newline at end of file diff --git a/btc-rpc-explorer/umbrel-app.yml b/btc-rpc-explorer/umbrel-app.yml index 67f6c73..187479d 100644 --- a/btc-rpc-explorer/umbrel-app.yml +++ b/btc-rpc-explorer/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: btc-rpc-explorer category: Explorers name: BTC RPC Explorer diff --git a/btcpay-server/docker-compose.yml b/btcpay-server/docker-compose.yml index 5dfe328..8509265 100644 --- a/btcpay-server/docker-compose.yml +++ b/btcpay-server/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_BTCPAY_SERVER_IP + APP_PORT: $APP_BTCPAY_SERVER_PORT + nbxplorer: image: nicolasdorier/nbxplorer:2.2.20@sha256:8f0e7f68513596e0a2555990d262169088a70204abe397bf18ba921f9b0608f3 user: "1000:1000" @@ -30,8 +35,6 @@ services: stop_grace_period: 1m depends_on: [ nbxplorer, postgres ] entrypoint: [ "dotnet", "BTCPayServer.dll" ] - ports: - - "$APP_BTCPAY_SERVER_PORT:$APP_BTCPAY_SERVER_PORT" volumes: - ${APP_DATA_DIR}/data/btcpay:/data - ${APP_DATA_DIR}/data/nbxplorer:/data/.nbxplorer diff --git a/btcpay-server/torrc.template b/btcpay-server/torrc.template deleted file mode 100644 index ac091df..0000000 --- a/btcpay-server/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# btcpay-server Hidden Service -HiddenServiceDir /data/app-btcpay-server -HiddenServicePort 80 $APP_BTCPAY_SERVER_IP:$APP_BTCPAY_SERVER_PORT \ No newline at end of file diff --git a/btcpay-server/umbrel-app.yml b/btcpay-server/umbrel-app.yml index c89fdae..ceadf98 100644 --- a/btcpay-server/umbrel-app.yml +++ b/btcpay-server/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: btcpay-server category: Finance name: BTCPay Server diff --git a/code-server/docker-compose.yml b/code-server/docker-compose.yml index 378e11a..688a981 100644 --- a/code-server/docker-compose.yml +++ b/code-server/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_CODE_SERVER_IP + APP_PORT: 8080 + server: image: codercom/code-server:3.11.1@sha256:9bb2444f9d0c26765924e29155ac4a8febecb1e080f12c4e368e71dbe6a675b5 restart: on-failure user: "1000:1000" - ports: - - "${APP_CODE_SERVER_PORT}:8080" volumes: - ${APP_DATA_DIR}/data:/home/coder environment: diff --git a/code-server/torrc.template b/code-server/torrc.template deleted file mode 100644 index e65cf42..0000000 --- a/code-server/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# code-server Hidden Service -HiddenServiceDir /data/app-code-server -HiddenServicePort 80 $APP_CODE_SERVER_IP:8080 \ No newline at end of file diff --git a/code-server/umbrel-app.yml b/code-server/umbrel-app.yml index c8dc26a..772d982 100644 --- a/code-server/umbrel-app.yml +++ b/code-server/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: code-server category: Development name: code-server diff --git a/electrumx/docker-compose.yml b/electrumx/docker-compose.yml index 6ee135d..ae55bff 100644 --- a/electrumx/docker-compose.yml +++ b/electrumx/docker-compose.yml @@ -1,14 +1,17 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_ELECTRUMX_IP + APP_PORT: 50001 + server: image: lukechilds/electrumx:v1.16.0@sha256:2949784536f8f85af229004e12e5b5c3a1d7428918a492f77b4e958035c2ae2a user: "1000:1000" init: true restart: on-failure stop_grace_period: 1m - ports: - - "${APP_ELECTRUMX_PORT}:50001" volumes: - ${APP_DATA_DIR}/data:/data environment: diff --git a/element/docker-compose.yml b/element/docker-compose.yml index 160cfe0..d7e7940 100644 --- a/element/docker-compose.yml +++ b/element/docker-compose.yml @@ -1,14 +1,17 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_ELEMENT_IP + APP_PORT: 80 + web: image: getumbrel/element-web:v1.8.4@sha256:16b2776278a8a9d8a2397ccd75484f8728fd3223cb3329bf572b50b8f950636c # NGINX parent container requires root # user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_ELEMENT_PORT:80" networks: default: ipv4_address: $APP_ELEMENT_IP diff --git a/element/torrc.template b/element/torrc.template deleted file mode 100644 index fda16db..0000000 --- a/element/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# element Hidden Service -HiddenServiceDir /data/app-element -HiddenServicePort 80 $APP_ELEMENT_IP:80 \ No newline at end of file diff --git a/element/umbrel-app.yml b/element/umbrel-app.yml index 3581d4b..622df6f 100644 --- a/element/umbrel-app.yml +++ b/element/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: element category: Social name: Element diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 7e4ade5..b3dc51f 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -1,12 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_GITEA_IP + APP_PORT: $APP_GITEA_PORT + server: image: gitea/gitea:1.15.2-rootless@sha256:6caabcf0e1a21a2d885f44c8f19693ce44ec3d443e2116f86a2937db453566a8 user: "1000:1000" restart: on-failure ports: - - "${APP_GITEA_PORT}:${APP_GITEA_PORT}" - "${APP_GITEA_SSH_PORT}:${APP_GITEA_SSH_PORT}" volumes: - ${APP_DATA_DIR}/data/gitea/data:/var/lib/gitea @@ -27,6 +31,7 @@ services: networks: default: ipv4_address: $APP_GITEA_IP + db: image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd user: "1000:1000" diff --git a/gitea/umbrel-app.yml b/gitea/umbrel-app.yml index 72853b3..564978f 100644 --- a/gitea/umbrel-app.yml +++ b/gitea/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: gitea category: Development name: Gitea diff --git a/helipad/docker-compose.yml b/helipad/docker-compose.yml index 934acb6..5510b11 100644 --- a/helipad/docker-compose.yml +++ b/helipad/docker-compose.yml @@ -1,14 +1,17 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_HELIPAD_IP + APP_PORT: 2112 + web: image: podcastindexorg/podcasting20-helipad:v0.1.9@sha256:9706dc5a337dd087b188b32685a342d5d69d154b3e0449e4623c4a4e3988dd22 init: true restart: on-failure stop_grace_period: 1m user: "1000:1000" - ports: - - ${APP_HELIPAD_PORT}:2112 volumes: - ${APP_DATA_DIR}/data:/data - ${LND_DATA_DIR}:/lnd:ro diff --git a/helipad/torrc.template b/helipad/torrc.template deleted file mode 100644 index 6351fef..0000000 --- a/helipad/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# helipad Hidden Service -HiddenServiceDir /data/app-helipad -HiddenServicePort 80 $APP_HELIPAD_IP:2112 \ No newline at end of file diff --git a/helipad/umbrel-app.yml b/helipad/umbrel-app.yml index 7a138f3..598b066 100644 --- a/helipad/umbrel-app.yml +++ b/helipad/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: helipad category: Lightning Node Management name: Helipad diff --git a/home-assistant/docker-compose.yml b/home-assistant/docker-compose.yml index 6502c25..fda049b 100644 --- a/home-assistant/docker-compose.yml +++ b/home-assistant/docker-compose.yml @@ -1,10 +1,13 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_HOME_ASSISTANT_IP + APP_PORT: 8123 + server: image: homeassistant/home-assistant:2021.12.0@sha256:116f78d5cf48c4b1adcb3eb665885cb0d14dc0156e9291015ca6fbce13540ff5 - ports: - - "${APP_HOME_ASSISTANT_PORT}:8123" volumes: - ${APP_DATA_DIR}/data:/config networks: diff --git a/home-assistant/torrc.template b/home-assistant/torrc.template deleted file mode 100644 index 6864ee1..0000000 --- a/home-assistant/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# home-assistant Hidden Service -HiddenServiceDir /data/app-home-assistant -HiddenServicePort 80 $APP_HOME_ASSISTANT_IP:8123 \ No newline at end of file diff --git a/home-assistant/umbrel-app.yml b/home-assistant/umbrel-app.yml index 520bf66..ddc585c 100644 --- a/home-assistant/umbrel-app.yml +++ b/home-assistant/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: home-assistant category: Automation name: Home Assistant diff --git a/itchysats/docker-compose.yml b/itchysats/docker-compose.yml index 86db3d2..6593541 100644 --- a/itchysats/docker-compose.yml +++ b/itchysats/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_ITCHYSATS_IP + APP_PORT: 8000 + web: image: ghcr.io/itchysats/itchysats/taker:0.4.10@sha256:6ce4691fa1d940a59598e1271f5c808869acfe8e6d639bead28076b5f7172414 restart: on-failure stop_grace_period: 1m - ports: - - ${APP_ITCHYSATS_PORT}:8000 volumes: - ${APP_DATA_DIR}/data:/data command: diff --git a/itchysats/torrc.template b/itchysats/torrc.template deleted file mode 100644 index 8caa698..0000000 --- a/itchysats/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# itchysats Hidden Service -HiddenServiceDir /data/app-itchysats -HiddenServicePort 80 $APP_ITCHYSATS_IP:8000 \ No newline at end of file diff --git a/itchysats/umbrel-app.yml b/itchysats/umbrel-app.yml index efd2f32..b56243d 100644 --- a/itchysats/umbrel-app.yml +++ b/itchysats/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: itchysats category: Finance name: ItchySats diff --git a/jam/docker-compose.yml b/jam/docker-compose.yml index f99bfbb..24cc1e8 100644 --- a/jam/docker-compose.yml +++ b/jam/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_JAM_IP + APP_PORT: 80 + jam: image: ghcr.io/joinmarket-webui/joinmarket-webui-standalone:v0.0.5-clientserver-v0.9.5@sha256:5fbbc766b25449e87f5fffb689d236b0a0c9b6332c1cb75478bcbc7225d04ad9 restart: on-failure stop_grace_period: 1m init: true - ports: - - "$APP_JAM_PORT:80" volumes: - ${APP_DATA_DIR}/data/joinmarket:/root/.joinmarket environment: diff --git a/jam/torrc.template b/jam/torrc.template deleted file mode 100644 index c0fd57c..0000000 --- a/jam/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# jam Hidden Service -HiddenServiceDir /data/app-jam -HiddenServicePort 80 $APP_JAM_IP:80 \ No newline at end of file diff --git a/jam/umbrel-app.yml b/jam/umbrel-app.yml index 13f60bc..4d80628 100644 --- a/jam/umbrel-app.yml +++ b/jam/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: jam category: Wallets name: Jam diff --git a/kollider/docker-compose.yml b/kollider/docker-compose.yml index a0b912e..0e45c16 100644 --- a/kollider/docker-compose.yml +++ b/kollider/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_KOLLIDER_IP + APP_PORT: 3000 backend: image: kolliderhq/kollider-lite-backend:v1.0.3@sha256:1229b8d800447ddd43b8e21e5dbbdc4773e873d3bc4f13a00976bc14607c393b init: true @@ -41,8 +45,6 @@ services: stop_grace_period: 1m volumes: - ${APP_DATA_DIR}/data/cache/images:/app/.next/cache/images - ports: - - "$APP_KOLLIDER_PORT:3000" networks: default: ipv4_address: $APP_KOLLIDER_IP diff --git a/kollider/umbrel-app.yml b/kollider/umbrel-app.yml index fd008ca..e11bb77 100644 --- a/kollider/umbrel-app.yml +++ b/kollider/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: kollider category: Finance name: Kollider diff --git a/krystal-bull/docker-compose.yml b/krystal-bull/docker-compose.yml index c1b3eea..bcc8ef6 100644 --- a/krystal-bull/docker-compose.yml +++ b/krystal-bull/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_KRYSTAL_BULL_IP + APP_PORT: 3001 web: image: bitcoinscala/oracle-server-ui:1.9.0-c946d255-SNAPSHOT@sha256:8524db49036e35ce0da2dca515d54ed997328c3ca339d81e7782d4764c195995 user: "1000:1000" @@ -16,8 +20,6 @@ services: TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT} DEFAULT_UI_PASSWORD: $APP_PASSWORD BITCOIN_S_ORACLE_RPC_PASSWORD: $APP_PASSWORD - ports: - - "${APP_KRYSTAL_BULL_PORT}:3001" networks: default: ipv4_address: $APP_KRYSTAL_BULL_IP diff --git a/krystal-bull/torrc.template b/krystal-bull/torrc.template deleted file mode 100644 index 1532cbe..0000000 --- a/krystal-bull/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# krystal-bull Hidden Service -HiddenServiceDir /data/app-krystal-bull -HiddenServicePort 80 $APP_KRYSTAL_BULL_IP:3001 \ No newline at end of file diff --git a/krystal-bull/umbrel-app.yml b/krystal-bull/umbrel-app.yml index d113288..781fe08 100644 --- a/krystal-bull/umbrel-app.yml +++ b/krystal-bull/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: krystal-bull category: Finance name: Krystal Bull diff --git a/lightning-shell/docker-compose.yml b/lightning-shell/docker-compose.yml index acceaa9..4764fba 100644 --- a/lightning-shell/docker-compose.yml +++ b/lightning-shell/docker-compose.yml @@ -1,12 +1,14 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_LIGHTNING_SHELL_IP + APP_PORT: 7681 web: image: ghcr.io/ibz/lightning-shell:v0.1.10-buster-slim@sha256:4ea6aafee8ddd092b27850bccef71458d9e382e63d12b159d075bfde328ebef3 restart: on-failure stop_grace_period: 1m - ports: - - ${APP_LIGHTNING_SHELL_PORT}:7681 volumes: - ${LND_DATA_DIR}:/lnd:ro - ${APP_DATA_DIR}/data:/data diff --git a/lightning-shell/torrc.template b/lightning-shell/torrc.template deleted file mode 100644 index 17ee142..0000000 --- a/lightning-shell/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# lightning-shell Hidden Service -HiddenServiceDir /data/app-lightning-shell -HiddenServicePort 80 $APP_LIGHTNING_SHELL_IP:7681 \ No newline at end of file diff --git a/lightning-shell/umbrel-app.yml b/lightning-shell/umbrel-app.yml index 424d8e2..f4348bb 100644 --- a/lightning-shell/umbrel-app.yml +++ b/lightning-shell/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: lightning-shell category: Lightning Node Management name: Lightning Shell diff --git a/lightning-terminal/docker-compose.yml b/lightning-terminal/docker-compose.yml index ec6c2b2..d05b94f 100644 --- a/lightning-terminal/docker-compose.yml +++ b/lightning-terminal/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_LIGHTNING_TERMINAL_IP + APP_PORT: $APP_LIGHTNING_TERMINAL_PORT + web: image: lightninglabs/lightning-terminal:v0.6.5-alpha@sha256:541fb9034a25dd4336becabdee6d40f76c3f4ae4557cbce30a46a3a8e3ef0e74 user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_LIGHTNING_TERMINAL_PORT:$APP_LIGHTNING_TERMINAL_PORT" volumes: - ${APP_DATA_DIR}/data:/data - ${LND_DATA_DIR}:/lnd:ro diff --git a/lightning-terminal/torrc.template b/lightning-terminal/torrc.template deleted file mode 100644 index 61bf106..0000000 --- a/lightning-terminal/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# lightning-terminal Hidden Service -HiddenServiceDir /data/app-lightning-terminal -HiddenServicePort 80 $APP_LIGHTNING_TERMINAL_IP:$APP_LIGHTNING_TERMINAL_PORT \ No newline at end of file diff --git a/lightning-terminal/umbrel-app.yml b/lightning-terminal/umbrel-app.yml index 7d04912..856b961 100644 --- a/lightning-terminal/umbrel-app.yml +++ b/lightning-terminal/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: lightning-terminal category: Lightning Node Management name: Lightning Terminal diff --git a/lnbits/docker-compose.yml b/lnbits/docker-compose.yml index 591ece7..1e8dd82 100644 --- a/lnbits/docker-compose.yml +++ b/lnbits/docker-compose.yml @@ -1,14 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_LNBITS_IP + APP_PORT: $APP_LNBITS_PORT web: image: lnbitsdocker/lnbits-legend:0.8.0@sha256:3426e326bac347d09b4e018780cb1ecd8e5eac35851383d476076769ab4a9b2e user: 1000:1000 init: true restart: on-failure stop_grace_period: 1m - ports: - - "$APP_LNBITS_PORT:$APP_LNBITS_PORT" volumes: - ${APP_DATA_DIR}/data:/data - ${LND_DATA_DIR}:/lnd:ro diff --git a/lnbits/torrc.template b/lnbits/torrc.template deleted file mode 100644 index ed55898..0000000 --- a/lnbits/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# lnbits Hidden Service -HiddenServiceDir /data/app-lnbits -HiddenServicePort 80 $APP_LNBITS_IP:$APP_LNBITS_PORT \ No newline at end of file diff --git a/lnbits/umbrel-app.yml b/lnbits/umbrel-app.yml index f74d251..3321ef8 100644 --- a/lnbits/umbrel-app.yml +++ b/lnbits/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: lnbits category: Finance name: LNbits diff --git a/lndg/docker-compose.yml b/lndg/docker-compose.yml index e289253..4ab3feb 100644 --- a/lndg/docker-compose.yml +++ b/lndg/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_LNDG_IP + APP_PORT: $APP_LNDG_PORT + web: image: ghcr.io/cryptosharks131/lndg:v1.0.5@sha256:cebb3cb42ebc26e7d148792e9f191dea78016cd514940a19143d3e51b5e023d2 restart: on-failure stop_grace_period: 1m - ports: - - "${APP_LNDG_PORT}:${APP_LNDG_PORT}" volumes: - ${LND_DATA_DIR}:/root/.lnd:ro - ${APP_DATA_DIR}:/lndg/data diff --git a/lndg/torrc.template b/lndg/torrc.template deleted file mode 100644 index bbecbd3..0000000 --- a/lndg/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# lndg Hidden Service -HiddenServiceDir /data/app-lndg -HiddenServicePort 80 $APP_LNDG_IP:$APP_LNDG_PORT \ No newline at end of file diff --git a/lndg/umbrel-app.yml b/lndg/umbrel-app.yml index ebe0b59..661d6ef 100644 --- a/lndg/umbrel-app.yml +++ b/lndg/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: lndg category: Lightning Node Management name: LNDg diff --git a/lnmarkets/docker-compose.yml b/lnmarkets/docker-compose.yml index 22307ff..c297920 100644 --- a/lnmarkets/docker-compose.yml +++ b/lnmarkets/docker-compose.yml @@ -1,14 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_LNMARKETS_IP + APP_PORT: $APP_LNMARKETS_PORT lnmarkets: image: ghcr.io/ln-markets/umbrel:v1.1.5@sha256:94b2259e4c2445d518cabc4bd6c0519c5fae87a3fb3c0bb564522e805d63bd89 init: true user: 1000:1000 restart: on-failure stop_grace_period: 1m - ports: - - "$APP_LNMARKETS_PORT:$APP_LNMARKETS_PORT" volumes: - ${LND_DATA_DIR}:/lnd:ro environment: diff --git a/lnmarkets/torrc.template b/lnmarkets/torrc.template deleted file mode 100644 index 5a7b685..0000000 --- a/lnmarkets/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# lnmarkets Hidden Service -HiddenServiceDir /data/app-lnmarkets -HiddenServicePort 80 $APP_LNMARKETS_IP:$APP_LNMARKETS_PORT \ No newline at end of file diff --git a/lnmarkets/umbrel-app.yml b/lnmarkets/umbrel-app.yml index 1e7984c..1398167 100644 --- a/lnmarkets/umbrel-app.yml +++ b/lnmarkets/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: lnmarkets category: Finance name: LN Markets diff --git a/mempool/docker-compose.yml b/mempool/docker-compose.yml index afbe683..c915eb4 100644 --- a/mempool/docker-compose.yml +++ b/mempool/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_MEMPOOL_IP + APP_PORT: $APP_MEMPOOL_PORT web: image: mempool/frontend:v2.3.1@sha256:38c955caeb58014b266904b059bfabbdab8321d20b11e7cccb139be6dfc8e36e user: "1000:1000" @@ -8,8 +12,6 @@ services: restart: on-failure stop_grace_period: 1m command: "./wait-for mariadb:3306 --timeout=720 -- nginx -g 'daemon off;'" - ports: - - ${APP_MEMPOOL_PORT}:${APP_MEMPOOL_PORT} environment: FRONTEND_HTTP_PORT: $APP_MEMPOOL_PORT BACKEND_MAINNET_HTTP_HOST: $APP_MEMPOOL_API_IP diff --git a/mempool/torrc.template b/mempool/torrc.template deleted file mode 100644 index ac28fc2..0000000 --- a/mempool/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# mempool Hidden Service -HiddenServiceDir /data/app-mempool -HiddenServicePort 80 $APP_MEMPOOL_IP:$APP_MEMPOOL_PORT \ No newline at end of file diff --git a/mempool/umbrel-app.yml b/mempool/umbrel-app.yml index b7a0aa2..cc22b66 100644 --- a/mempool/umbrel-app.yml +++ b/mempool/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: mempool category: Explorers name: mempool diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 4e0a343..afcdf3b 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_NEXTCLOUD_IP + APP_PORT: 80 db: image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd user: "1000:1000" @@ -33,8 +37,6 @@ services: # https://github.com/nextcloud/docker/blob/05026b029d37fc5cd488d4a4a2a79480e39841ba/21.0/apache/entrypoint.sh#L53-L77 # user: "1000:1000" restart: on-failure - ports: - - ${APP_NEXTCLOUD_PORT}:80 volumes: - ${APP_DATA_DIR}/data/nextcloud:/var/www/html environment: diff --git a/nextcloud/torrc.template b/nextcloud/torrc.template deleted file mode 100644 index b55d758..0000000 --- a/nextcloud/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# nextcloud Hidden Service -HiddenServiceDir /data/app-nextcloud -HiddenServicePort 80 $APP_NEXTCLOUD_IP:80 \ No newline at end of file diff --git a/nextcloud/umbrel-app.yml b/nextcloud/umbrel-app.yml index 32019d3..b9ff2bb 100644 --- a/nextcloud/umbrel-app.yml +++ b/nextcloud/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: nextcloud category: Files name: Nextcloud diff --git a/node-red/docker-compose.yml b/node-red/docker-compose.yml index 5fb92d4..15c9fce 100644 --- a/node-red/docker-compose.yml +++ b/node-red/docker-compose.yml @@ -1,12 +1,14 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_NODE_RED_IP + APP_PORT: $APP_NODE_RED_PORT web: image: nodered/node-red:2.0.6-12@sha256:c15bfeef73c2b348c0fb5f70d3b3013575a6ebf2af942a1d8196c7d7d842f6bb restart: on-failure stop_grace_period: 1m - ports: - - "${APP_NODE_RED_PORT}:${APP_NODE_RED_PORT}" volumes: - ${APP_DATA_DIR}/data:/data - ${LND_DATA_DIR}:/lnd:ro diff --git a/node-red/torrc.template b/node-red/torrc.template deleted file mode 100644 index 0e17e32..0000000 --- a/node-red/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# node-red Hidden Service -HiddenServiceDir /data/app-node-red -HiddenServicePort 80 $APP_NODE_RED_IP:$APP_NODE_RED_PORT \ No newline at end of file diff --git a/node-red/umbrel-app.yml b/node-red/umbrel-app.yml index a8d419a..505750d 100644 --- a/node-red/umbrel-app.yml +++ b/node-red/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: node-red category: Automation name: Node-RED diff --git a/photoprism/docker-compose.yml b/photoprism/docker-compose.yml index 32f2ea4..1ee1706 100644 --- a/photoprism/docker-compose.yml +++ b/photoprism/docker-compose.yml @@ -1,13 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_PHOTOPRISM_IP + APP_PORT: $APP_PHOTOPRISM_PORT web: image: photoprism/photoprism:20210925@sha256:238e6955804d82097d08f0e4318835721f46bd844f9065a38aa7d112ab72906e user: "1000:1000" restart: on-failure stop_grace_period: "1m" - ports: - - ${APP_PHOTOPRISM_PORT}:${APP_PHOTOPRISM_PORT} volumes: - "${APP_DATA_DIR}/originals:/photoprism/originals" - "${APP_DATA_DIR}/storage:/photoprism/storage" diff --git a/photoprism/torrc.template b/photoprism/torrc.template deleted file mode 100644 index ba189fa..0000000 --- a/photoprism/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# photoprism Hidden Service -HiddenServiceDir /data/app-photoprism -HiddenServicePort 80 $APP_PHOTOPRISM_IP:$APP_PHOTOPRISM_PORT \ No newline at end of file diff --git a/photoprism/umbrel-app.yml b/photoprism/umbrel-app.yml index 7889e3e..ed820c6 100644 --- a/photoprism/umbrel-app.yml +++ b/photoprism/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: photoprism category: Files name: PhotoPrism diff --git a/pi-hole/docker-compose.yml b/pi-hole/docker-compose.yml index c2352c1..18941fc 100644 --- a/pi-hole/docker-compose.yml +++ b/pi-hole/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_PI_HOLE_IP + APP_PORT: 80 server: image: pihole/pihole:2022.01.1@sha256:a02faea91d505d0bfc1583049f3e943f2c3afe03df574e625ffa828b16b85832 # Pi-hole doesn't currently support running as non-root @@ -10,7 +14,6 @@ services: ports: - 53:53 - 53:53/udp - - ${APP_PI_HOLE_PORT}:80 volumes: - ${APP_DATA_DIR}/data/pihole:/etc/pihole/ - ${APP_DATA_DIR}/data/dnsmasq:/etc/dnsmasq.d/ diff --git a/pi-hole/torrc.template b/pi-hole/torrc.template deleted file mode 100644 index 3f4409f..0000000 --- a/pi-hole/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# pi-hole Hidden Service -HiddenServiceDir /data/app-pi-hole -HiddenServicePort 80 $APP_PI_HOLE_IP:80 \ No newline at end of file diff --git a/pi-hole/umbrel-app.yml b/pi-hole/umbrel-app.yml index 54abad2..63116f3 100644 --- a/pi-hole/umbrel-app.yml +++ b/pi-hole/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: pi-hole category: Networking name: Pi-hole diff --git a/ride-the-lightning/docker-compose.yml b/ride-the-lightning/docker-compose.yml index 0a447c9..36f5ad3 100644 --- a/ride-the-lightning/docker-compose.yml +++ b/ride-the-lightning/docker-compose.yml @@ -1,13 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_RIDE_THE_LIGHTNING_IP + APP_PORT: $APP_RIDE_THE_LIGHTNING_PORT web: image: shahanafarooqui/rtl:0.12.1@sha256:8589a880f6357e5ea5cc3826e1704f4e91de324067f34388586faa0395204725 user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_RIDE_THE_LIGHTNING_PORT:$APP_RIDE_THE_LIGHTNING_PORT" volumes: - ${APP_DATA_DIR}/rtl:/data - ${APP_DATA_DIR}/loop:/loop diff --git a/ride-the-lightning/torrc.template b/ride-the-lightning/torrc.template deleted file mode 100644 index 5d8fc8b..0000000 --- a/ride-the-lightning/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# ride-the-lightning Hidden Service -HiddenServiceDir /data/app-ride-the-lightning -HiddenServicePort 80 $APP_RIDE_THE_LIGHTNING_IP:$APP_RIDE_THE_LIGHTNING_PORT \ No newline at end of file diff --git a/ride-the-lightning/umbrel-app.yml b/ride-the-lightning/umbrel-app.yml index 7d31832..c0f4673 100644 --- a/ride-the-lightning/umbrel-app.yml +++ b/ride-the-lightning/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: ride-the-lightning category: Lightning Node Management name: Ride The Lightning diff --git a/samourai-server/docker-compose.yml b/samourai-server/docker-compose.yml index 5be5908..8fb0274 100644 --- a/samourai-server/docker-compose.yml +++ b/samourai-server/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SAMOURAI_SERVER_IP + APP_PORT: 8081 db: image: louneskmt/dojo-db:1.5.0-low-mem@sha256:e82c23699196bcaf37fe021ca47eef1c53d18ba8a10290ae8dcfe7cb24dbb5e6 init: true @@ -132,7 +136,6 @@ services: WHIRLPOOL_API_KEY: $SAMOURAI_SERVER_WHIRLPOOL_API_KEY ports: - "$APP_SAMOURAI_SERVER_DOJO_PORT:80" - - "$APP_SAMOURAI_SERVER_CONNECT_PORT:8081" depends_on: - node networks: diff --git a/samourai-server/exports.sh b/samourai-server/exports.sh index 6fb178a..0933310 100644 --- a/samourai-server/exports.sh +++ b/samourai-server/exports.sh @@ -6,8 +6,8 @@ export APP_SAMOURAI_SERVER_WHIRLPOOL_PORT="8898" export APP_SAMOURAI_SERVER_DB_IP="10.21.21.24" export APP_SAMOURAI_SERVER_NODE_IP="10.21.21.25" -dojo_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-dojo/hostname" -whirlpool_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-whirlpool/hostname" +dojo_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-dojo/hostname" +whirlpool_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-whirlpool/hostname" export SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE="$(cat "${dojo_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" export SAMOURAI_SERVER_WHIRLPOOL_HIDDEN_SERVICE="$(cat "${whirlpool_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" export SAMOURAI_SERVER_NODE_API_KEY=$(derive_entropy "env-${app_entropy_identifier}-NODE_API_KEY") diff --git a/samourai-server/umbrel-app.yml b/samourai-server/umbrel-app.yml index 54fe3fd..96021ca 100644 --- a/samourai-server/umbrel-app.yml +++ b/samourai-server/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: samourai-server category: Wallet Servers name: Samourai Server diff --git a/satsale/docker-compose.yml b/satsale/docker-compose.yml index 560c858..6395897 100644 --- a/satsale/docker-compose.yml +++ b/satsale/docker-compose.yml @@ -1,6 +1,10 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SATSALE_IP + APP_PORT: 5000 satsale: image: satsale/satsale:0.1.13@sha256:98380ad6c5166d83e627c4d1f4efdbcfd5b9217096f7fb26b287fda89eebccbb restart: on-failure @@ -8,8 +12,6 @@ services: volumes: - ${APP_DATA_DIR}/data:/data - ${LND_DATA_DIR}:/lnd:ro - ports: - - ${APP_SATSALE_PORT}:5000 environment: DATA_DIR: "/data" # Lightning node connection details diff --git a/satsale/torrc.template b/satsale/torrc.template deleted file mode 100644 index 5db8909..0000000 --- a/satsale/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# satsale Hidden Service -HiddenServiceDir /data/app-satsale -HiddenServicePort 80 $APP_SATSALE_IP:5000 \ No newline at end of file diff --git a/satsale/umbrel-app.yml b/satsale/umbrel-app.yml index ea5d15e..d6635e7 100644 --- a/satsale/umbrel-app.yml +++ b/satsale/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: satsale category: Finance name: SatSale diff --git a/simple-torrent/docker-compose.yml b/simple-torrent/docker-compose.yml index 6c084a0..5b931d7 100644 --- a/simple-torrent/docker-compose.yml +++ b/simple-torrent/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SIMPLE_TORRENT_IP + APP_PORT: $APP_SIMPLETORRENT_PORT + server: image: boypt/cloud-torrent:1.3.4@sha256:a1355e9ac319d523ce1fd6e8d34ab8e4bf0b5476c52bfe244e37fea64f6f4228 user: "1000:1000" restart: on-failure - ports: - - "${APP_SIMPLETORRENT_PORT}:${APP_SIMPLETORRENT_PORT}" command: > --port=${APP_SIMPLE_TORRENT_PORT} --config-path /config/simple-torrent.json diff --git a/simple-torrent/torrc.template b/simple-torrent/torrc.template deleted file mode 100644 index d0bc216..0000000 --- a/simple-torrent/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# simple-torrent Hidden Service -HiddenServiceDir /data/app-simple-torrent -HiddenServicePort 80 $APP_SIMPLE_TORRENT_IP:$APP_SIMPLE_TORRENT_PORT \ No newline at end of file diff --git a/simple-torrent/umbrel-app.yml b/simple-torrent/umbrel-app.yml index 30d7aa7..3ee6bce 100644 --- a/simple-torrent/umbrel-app.yml +++ b/simple-torrent/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: simple-torrent category: Networking name: SimpleTorrent diff --git a/snowflake/docker-compose.yml b/snowflake/docker-compose.yml index e931c48..1c7c7e6 100644 --- a/snowflake/docker-compose.yml +++ b/snowflake/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SNOWFLAKE_IP + APP_PORT: $APP_SNOWFLAKE_PORT + proxy: image: getumbrel/snowflake:v2.1.0@sha256:875a513540a132752a4b09f5d6de4ed41399c5331265d6576dcfb5952bb22053 restart: on-failure @@ -16,8 +21,6 @@ services: image: getumbrel/gotty:v1.0.1@sha256:100571d271cfbae25603acac216afce511eece9961218c6db427e0fa4a58716a restart: on-failure stop_grace_period: 1m - ports: - - $APP_SNOWFLAKE_PORT:$APP_SNOWFLAKE_PORT command: --port $APP_SNOWFLAKE_PORT --index "/snowflake/index.html" --title-format "Tor Snowflake Proxy" bash -c 'tail -n 10000 -f /snowflake/snowflake.log | grep "Traffic Relayed"' volumes: - ${APP_DATA_DIR}/data:/snowflake diff --git a/snowflake/torrc.template b/snowflake/torrc.template deleted file mode 100644 index eba46d5..0000000 --- a/snowflake/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# snowflake Hidden Service -HiddenServiceDir /data/app-snowflake -HiddenServicePort 80 $APP_SNOWFLAKE_IP:$APP_SNOWFLAKE_PORT \ No newline at end of file diff --git a/snowflake/umbrel-app.yml b/snowflake/umbrel-app.yml index 4253ef1..4150d1e 100644 --- a/snowflake/umbrel-app.yml +++ b/snowflake/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: snowflake category: Networking name: Tor Snowflake Proxy diff --git a/sparkkiosk/docker-compose.yml b/sparkkiosk/docker-compose.yml index bea45e6..18d0b03 100644 --- a/sparkkiosk/docker-compose.yml +++ b/sparkkiosk/docker-compose.yml @@ -1,14 +1,17 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SPARKKIOSK_IP + APP_PORT: 21214 + web: image: jensgertsen/sparkkiosk:v1.0.0@sha256:d49500ce9c47d04436e64dae7e336416aa32f83673058154aa8a983e1420008c user: 1000:1000 init: true restart: on-failure stop_grace_period: 1m - ports: - - $APP_SPARKKIOSK_PORT:21214 volumes: - ${APP_DATA_DIR}/data:/data - ${LND_DATA_DIR}:/lnd:ro diff --git a/sparkkiosk/torrc.template b/sparkkiosk/torrc.template deleted file mode 100644 index 16d9988..0000000 --- a/sparkkiosk/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# sparkkiosk Hidden Service -HiddenServiceDir /data/app-sparkkiosk -HiddenServicePort 80 $APP_SPARKKIOSK_IP:21214 \ No newline at end of file diff --git a/sparkkiosk/umbrel-app.yml b/sparkkiosk/umbrel-app.yml index 1e55b04..8fb8f46 100644 --- a/sparkkiosk/umbrel-app.yml +++ b/sparkkiosk/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: sparkkiosk category: Finance name: Sparkkiosk diff --git a/specter-desktop/docker-compose.yml b/specter-desktop/docker-compose.yml index 64e1222..72b92d5 100644 --- a/specter-desktop/docker-compose.yml +++ b/specter-desktop/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SPECTER_DESKTOP_IP + APP_PORT: $APP_SPECTER_DESKTOP_PORT + web: image: lncm/specter-desktop:v1.8.1@sha256:0fab344245e0b3fb27b8d62a74e2503e53d1a51ab8b9c8a6170f975bf880a70a stop_signal: SIGINT restart: on-failure stop_grace_period: 1m - ports: - - "$APP_SPECTER_DESKTOP_PORT:$APP_SPECTER_DESKTOP_PORT" volumes: - ${APP_DATA_DIR}/data:/data command: diff --git a/specter-desktop/torrc.template b/specter-desktop/torrc.template deleted file mode 100644 index 1883fcd..0000000 --- a/specter-desktop/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# specter-desktop Hidden Service -HiddenServiceDir /data/app-specter-desktop -HiddenServicePort 80 $APP_SPECTER_DESKTOP_IP:$APP_SPECTER_DESKTOP_PORT \ No newline at end of file diff --git a/specter-desktop/umbrel-app.yml b/specter-desktop/umbrel-app.yml index 58895ac..5aafa35 100644 --- a/specter-desktop/umbrel-app.yml +++ b/specter-desktop/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: specter-desktop category: Wallets name: Specter Desktop diff --git a/sphinx-relay/docker-compose.yml b/sphinx-relay/docker-compose.yml index d25131e..bfefdca 100644 --- a/sphinx-relay/docker-compose.yml +++ b/sphinx-relay/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SPHINX_RELAY_IP + APP_PORT: $APP_SPHINX_RELAY_PORT + sphinx-relay: container_name: sphinx-relay image: sphinxlightning/sphinx-relay:v2.2.5@sha256:9c7b112ead4585a92b6d65ebaa6206cf64069813b382b361c6c928c0def8a682 @@ -10,8 +15,6 @@ services: volumes: - ${LND_DATA_DIR}:/lnd:ro - ${APP_DATA_DIR}/data:/relay/.lnd/ - ports: - - "$APP_SPHINX_RELAY_PORT:$APP_SPHINX_RELAY_PORT" environment: PUBLIC_URL: "$APP_HIDDEN_SERVICE:$APP_SPHINX_RELAY_PORT" LND_IP: $LND_IP diff --git a/sphinx-relay/umbrel-app.yml b/sphinx-relay/umbrel-app.yml index be9dc53..631da60 100644 --- a/sphinx-relay/umbrel-app.yml +++ b/sphinx-relay/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: sphinx-relay category: Social name: Sphinx Relay diff --git a/squeaknode/docker-compose.yml b/squeaknode/docker-compose.yml index d99bfd4..b77e058 100644 --- a/squeaknode/docker-compose.yml +++ b/squeaknode/docker-compose.yml @@ -1,12 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SQUEAKNODE_IP + APP_PORT: $APP_SQUEAKNODE_PORT + web: image: ghcr.io/squeaknode/squeaknode:v0.2.16@sha256:25d9bd4ce22b4265979d64ce9a2417c883492cd8dce7f171fc5488d27db6c809 restart: on-failure stop_grace_period: 1m ports: - - "$APP_SQUEAKNODE_PORT:$APP_SQUEAKNODE_PORT" - "$APP_SQUEAKNODE_GRPC_PORT:$APP_SQUEAKNODE_GRPC_PORT" volumes: - ${APP_DATA_DIR}/sqk:/sqk diff --git a/squeaknode/exports.sh b/squeaknode/exports.sh index b4fa53f..33662c3 100644 --- a/squeaknode/exports.sh +++ b/squeaknode/exports.sh @@ -2,4 +2,7 @@ export APP_SQUEAKNODE_IP="10.21.21.54" export APP_SQUEAKNODE_PORT="12994" export APP_SQUEAKNODE_GRPC_PORT="8994" export APP_SQUEAKNODE_P2P_PORT="8555" -export APP_SQUEAKNODE_P2P_TESTNET_PORT="18555" \ No newline at end of file +export APP_SQUEAKNODE_P2P_TESTNET_PORT="18555" + +squeaknode_p2p_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-p2p/hostname" +export SQUEAKNODE_P2P_HIDDEN_SERVICE="$(cat "${squeaknode_p2p_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" \ No newline at end of file diff --git a/squeaknode/umbrel-app.yml b/squeaknode/umbrel-app.yml index 6a5f419..b6a00f5 100644 --- a/squeaknode/umbrel-app.yml +++ b/squeaknode/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: squeaknode category: Social name: Squeaknode diff --git a/suredbits-wallet/docker-compose.yml b/suredbits-wallet/docker-compose.yml index 7542f5c..5154c32 100644 --- a/suredbits-wallet/docker-compose.yml +++ b/suredbits-wallet/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SUREDBITS_WALLET_IP + APP_PORT: 3002 + web: image: bitcoinscala/wallet-server-ui:1.9.0-19b72728-SNAPSHOT@sha256:e3a4dfd7748a4cfce714beacca869c9116026c03dda9130987e151531d374290 user: "1000:1000" @@ -18,13 +23,12 @@ services: TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT} DEFAULT_UI_PASSWORD: $APP_PASSWORD BITCOIN_S_SERVER_RPC_PASSWORD: $APP_PASSWORD - ports: - - "${APP_SUREDBITS_WALLET_PORT}:3002" networks: default: ipv4_address: $APP_SUREDBITS_WALLET_IP depends_on: - walletserver + walletserver: image: bitcoinscala/bitcoin-s-server:1.9.0-93-4b964074-SNAPSHOT@sha256:e657deb2e6f65cce2f780680322f1b1212d9707a395dd57bace20617cb417833 user: "1000:1000" diff --git a/suredbits-wallet/exports.sh b/suredbits-wallet/exports.sh index 8e7f9eb..94b313d 100644 --- a/suredbits-wallet/exports.sh +++ b/suredbits-wallet/exports.sh @@ -1,4 +1,7 @@ export APP_SUREDBITS_WALLET_IP="10.21.21.73" export APP_SUREDBITS_WALLET_PORT="3020" export APP_SUREDBITS_WALLET_SERVER_IP="10.21.21.74" -export APP_SUREDBITS_WALLET_P2P_PORT="2862" \ No newline at end of file +export APP_SUREDBITS_WALLET_P2P_PORT="2862" + +suredbits_wallet_p2p_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-p2p/hostname" +export SUREDBITS_WALLET_P2P_HIDDEN_SERVICE="$(cat "${suredbits_wallet_p2p_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" \ No newline at end of file diff --git a/suredbits-wallet/umbrel-app.yml b/suredbits-wallet/umbrel-app.yml index 4706d97..4d61914 100644 --- a/suredbits-wallet/umbrel-app.yml +++ b/suredbits-wallet/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: suredbits-wallet category: Finance name: Suredbits Wallet diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml index 86b4e11..3de578d 100644 --- a/synapse/docker-compose.yml +++ b/synapse/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SYNAPSE_IP + APP_PORT: $APP_SYNAPSE_PORT + server: image: matrixdotorg/synapse:v1.42.0@sha256:10a1dd576504af002a1107d6d1edddc5bb891ccfc404218fbd99a15531cef742 user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_SYNAPSE_PORT:$APP_SYNAPSE_PORT" entrypoint: "bash" command: "-c './start.py generate && ./start.py migrate_config && exec ./start.py'" volumes: diff --git a/synapse/umbrel-app.yml b/synapse/umbrel-app.yml index 4eb3643..6495f77 100644 --- a/synapse/umbrel-app.yml +++ b/synapse/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: synapse category: Social name: Synapse diff --git a/syncthing/docker-compose.yml b/syncthing/docker-compose.yml index 5386fb3..b83f4b8 100644 --- a/syncthing/docker-compose.yml +++ b/syncthing/docker-compose.yml @@ -1,6 +1,11 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_SYNCTHING_IP + APP_PORT: $APP_SYNCTHING_PORT + server: image: syncthing/syncthing:1.18.4@sha256:97fc6221819aceab9055d120a01d2981a30d3aef962f1ec5eda2b21cfaa883c8 restart: on-failure @@ -12,7 +17,6 @@ services: volumes: - ${APP_DATA_DIR}/data:/var/syncthing ports: - - ${APP_SYNCTHING_PORT}:${APP_SYNCTHING_PORT} - ${APP_SYNCTHING_SYNC_PORT}:${APP_SYNCTHING_SYNC_PORT}/tcp - ${APP_SYNCTHING_SYNC_PORT}:${APP_SYNCTHING_SYNC_PORT}/udp networks: diff --git a/syncthing/torrc.template b/syncthing/torrc.template deleted file mode 100644 index d923f3b..0000000 --- a/syncthing/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# syncthing Hidden Service -HiddenServiceDir /data/app-syncthing -HiddenServicePort 80 $APP_SYNCTHING_IP:$APP_SYNCTHING_PORT \ No newline at end of file diff --git a/syncthing/umbrel-app.yml b/syncthing/umbrel-app.yml index f8400b6..f7c215b 100644 --- a/syncthing/umbrel-app.yml +++ b/syncthing/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: syncthing category: Files name: Syncthing diff --git a/tailscale/docker-compose.yml b/tailscale/docker-compose.yml index 9827a3c..fb1e7f2 100644 --- a/tailscale/docker-compose.yml +++ b/tailscale/docker-compose.yml @@ -1,6 +1,12 @@ version: "3.7" services: + app_proxy: + environment: + # TODO: FIX THIS! + APP_HOST: $APP_TAILSCALE_IP + APP_PORT: $APP_TAILSCALE_PORT + web: network_mode: "host" # TODO: We can remove this later with some iptables magic image: tailscale/tailscale:v1.22.1@sha256:a8f3198bccfb3d281735cd99f33537c4023fd18d7aa4bce36cdaa827b1124ba0 diff --git a/tailscale/torrc.template b/tailscale/torrc.template deleted file mode 100644 index 9f5b4ca..0000000 --- a/tailscale/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# tailscale Hidden Service -HiddenServiceDir /data/app-tailscale -HiddenServicePort 80 $APP_TAILSCALE_IP:$APP_TAILSCALE_PORT \ No newline at end of file diff --git a/tailscale/umbrel-app.yml b/tailscale/umbrel-app.yml index f5ea85c..ee18bc0 100644 --- a/tailscale/umbrel-app.yml +++ b/tailscale/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: tailscale category: Networking name: Tailscale diff --git a/tallycoin-connect/docker-compose.yml b/tallycoin-connect/docker-compose.yml index e8601af..30d64be 100644 --- a/tallycoin-connect/docker-compose.yml +++ b/tallycoin-connect/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_TALLYCOIN_CONNECT_IP + APP_PORT: $APP_TALLYCOIN_CONNECT_PORT + web: image: dennisreimann/tallycoin_connect:v1.7.3@sha256:802a53da7591473c1a8d97e145a717781c152657343498f62ef3f53e56c86c67 user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_TALLYCOIN_CONNECT_PORT:$APP_TALLYCOIN_CONNECT_PORT" volumes: - ${LND_DATA_DIR}:/lnd:ro - ${APP_DATA_DIR}/data:/data diff --git a/tallycoin-connect/torrc.template b/tallycoin-connect/torrc.template deleted file mode 100644 index 819b778..0000000 --- a/tallycoin-connect/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# tallycoin-connect Hidden Service -HiddenServiceDir /data/app-tallycoin-connect -HiddenServicePort 80 $APP_TALLYCOIN_CONNECT_IP:$APP_TALLYCOIN_CONNECT_PORT \ No newline at end of file diff --git a/tallycoin-connect/umbrel-app.yml b/tallycoin-connect/umbrel-app.yml index a7ffc69..4b7b04f 100644 --- a/tallycoin-connect/umbrel-app.yml +++ b/tallycoin-connect/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: tallycoin-connect category: Finance name: Tallycoin Connect diff --git a/thunderhub/docker-compose.yml b/thunderhub/docker-compose.yml index 5baff0a..93f385a 100644 --- a/thunderhub/docker-compose.yml +++ b/thunderhub/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_THUNDERHUB_IP + APP_PORT: $APP_THUNDERHUB_PORT + web: image: apotdevin/thunderhub:v0.12.31@sha256:f86341cb1987a3907f7227ccd4c00dead68d372e464b111414b8427228062276 user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_THUNDERHUB_PORT:$APP_THUNDERHUB_PORT" volumes: - ${LND_DATA_DIR}:/lnd:ro - ${APP_DATA_DIR}/data:/data diff --git a/thunderhub/torrc.template b/thunderhub/torrc.template deleted file mode 100644 index f4e0680..0000000 --- a/thunderhub/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# thunderhub Hidden Service -HiddenServiceDir /data/app-thunderhub -HiddenServicePort 80 $APP_THUNDERHUB_IP:$APP_THUNDERHUB_PORT \ No newline at end of file diff --git a/thunderhub/umbrel-app.yml b/thunderhub/umbrel-app.yml index 98ce052..20b0c73 100644 --- a/thunderhub/umbrel-app.yml +++ b/thunderhub/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: thunderhub category: Lightning Node Management name: ThunderHub diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/docker-compose.yml index 98f8805..fb8af07 100644 --- a/uptime-kuma/docker-compose.yml +++ b/uptime-kuma/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_UPTIME_KUMA_IP + APP_PORT: 3001 + uptime-kuma: image: louislam/uptime-kuma:1.11.1@sha256:9fd26d8adae499533e0079f218b4c9139e89b3a085ec04b246c3fbf7af04aa62 restart: on-failure stop_grace_period: 1m - ports: - - ${APP_UPTIME_KUMA_PORT}:3001 volumes: - ${APP_DATA_DIR}/data/uptime-kuma:/app/data networks: diff --git a/uptime-kuma/torrc.template b/uptime-kuma/torrc.template deleted file mode 100644 index 455ffc6..0000000 --- a/uptime-kuma/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# uptime-kuma Hidden Service -HiddenServiceDir /data/app-uptime-kuma -HiddenServicePort 80 $APP_UPTIME_KUMA_IP:3001 \ No newline at end of file diff --git a/uptime-kuma/umbrel-app.yml b/uptime-kuma/umbrel-app.yml index b71bdf5..dc4bf48 100644 --- a/uptime-kuma/umbrel-app.yml +++ b/uptime-kuma/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: uptime-kuma category: Networking name: Uptime Kuma diff --git a/urbit-bitcoin-connector/docker-compose.yml b/urbit-bitcoin-connector/docker-compose.yml index d0a18df..50ddad1 100644 --- a/urbit-bitcoin-connector/docker-compose.yml +++ b/urbit-bitcoin-connector/docker-compose.yml @@ -1,13 +1,17 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_URBIT_BITCOIN_CONNECTOR_IP + APP_PORT: $APP_URBIT_BITCOIN_CONNECTOR_PORT + web: image: matwet/urbit-btc-node:latest@sha256:930a1752684277f743d2b48a59b4b977da96423d49ed4b5076c14cd81fa5e286 init: true restart: on-failure stop_grace_period: 1m ports: - - ${APP_URBIT_BITCOIN_CONNECTOR_PORT}:${APP_URBIT_BITCOIN_CONNECTOR_PORT} - ${APP_URBIT_BITCOIN_CONNECTOR_SERVER_PORT}:${APP_URBIT_BITCOIN_CONNECTOR_SERVER_PORT} environment: INTERNAL_IP: $APP_URBIT_BITCOIN_CONNECTOR_IP diff --git a/urbit-bitcoin-connector/torrc.template b/urbit-bitcoin-connector/torrc.template deleted file mode 100644 index 569f014..0000000 --- a/urbit-bitcoin-connector/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# urbit-bitcoin-connector Hidden Service -HiddenServiceDir /data/app-urbit-bitcoin-connector -HiddenServicePort 80 $APP_URBIT_BITCOIN_CONNECTOR_IP:$APP_URBIT_BITCOIN_CONNECTOR_PORT \ No newline at end of file diff --git a/urbit-bitcoin-connector/umbrel-app.yml b/urbit-bitcoin-connector/umbrel-app.yml index 49d2058..7737f8e 100644 --- a/urbit-bitcoin-connector/umbrel-app.yml +++ b/urbit-bitcoin-connector/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: urbit-bitcoin-connector category: Wallet Servers name: Urbit Bitcoin Connector diff --git a/urbit/docker-compose.yml b/urbit/docker-compose.yml index 90c57d7..42cfe49 100644 --- a/urbit/docker-compose.yml +++ b/urbit/docker-compose.yml @@ -1,9 +1,13 @@ version: "3.3" services: + app_proxy: + environment: + APP_HOST: $APP_URBIT_IP + APP_PORT: 8090 + manager: image: mopfelwinrux/urbit-umbrel:v0.3.0@sha256:09ee4550be66894cc2b763d5cff9a4ed15b13a3c2a298519a857c6542069d8c7 ports: - - "${APP_URBIT_PORT}:8090" - "${APP_URBIT_P2P_PORT}:34343" volumes: - ${APP_DATA_DIR}/piers:/data/piers diff --git a/urbit/umbrel-app.yml b/urbit/umbrel-app.yml index 159b3ce..1fcd276 100644 --- a/urbit/umbrel-app.yml +++ b/urbit/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: urbit category: Networking name: Urbit diff --git a/usocial/docker-compose.yml b/usocial/docker-compose.yml index 9a19306..0b29cae 100644 --- a/usocial/docker-compose.yml +++ b/usocial/docker-compose.yml @@ -1,12 +1,15 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_USOCIAL_IP + APP_PORT: 5000 + web: image: ghcr.io/ibz/usocial:v0.1.5-buster@sha256:1b1215d7fba847bf922a2615fee6400ce61cac4545dff6bfcf9703af8e05b953 restart: on-failure stop_grace_period: 1m - ports: - - ${APP_USOCIAL_PORT}:5000 volumes: - ${LND_DATA_DIR}:/lnd:ro - ${APP_DATA_DIR}/data:/instance @@ -19,6 +22,7 @@ services: networks: default: ipv4_address: $APP_USOCIAL_IP + fetcher: depends_on: - web diff --git a/usocial/torrc.template b/usocial/torrc.template deleted file mode 100644 index 0be6f5e..0000000 --- a/usocial/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# usocial Hidden Service -HiddenServiceDir /data/app-usocial -HiddenServicePort 80 $APP_USOCIAL_IP:5000 \ No newline at end of file diff --git a/usocial/umbrel-app.yml b/usocial/umbrel-app.yml index dfea4c3..43e7d31 100644 --- a/usocial/umbrel-app.yml +++ b/usocial/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: usocial category: Social name: usocial diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 795e956..7787e98 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -1,13 +1,16 @@ version: "3.7" services: + app_proxy: + environment: + APP_HOST: $APP_VAULTWARDEN_IP + APP_PORT: $APP_VAULTWARDEN_PORT + server: image: vaultwarden/server:1.22.2@sha256:fe2a236b792fb2304ef50f86f1c25076ac5b2748e1b776fce260ad12ad29188d user: "1000:1000" restart: on-failure stop_grace_period: 1m - ports: - - "$APP_VAULTWARDEN_PORT:$APP_VAULTWARDEN_PORT" volumes: - ${APP_DATA_DIR}/data:/data environment: diff --git a/vaultwarden/torrc.template b/vaultwarden/torrc.template deleted file mode 100644 index 6278a24..0000000 --- a/vaultwarden/torrc.template +++ /dev/null @@ -1,3 +0,0 @@ -# vaultwarden Hidden Service -HiddenServiceDir /data/app-vaultwarden -HiddenServicePort 80 $APP_VAULTWARDEN_IP:$APP_VAULTWARDEN_PORT \ No newline at end of file diff --git a/vaultwarden/umbrel-app.yml b/vaultwarden/umbrel-app.yml index 3c48712..93bdcd7 100644 --- a/vaultwarden/umbrel-app.yml +++ b/vaultwarden/umbrel-app.yml @@ -1,4 +1,4 @@ -manifest: 1 +manifestVersion: 1 id: vaultwarden category: Password Managers name: Vaultwarden