Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Samourai Server hotfix #2021

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Samourai Server hotfix #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df02b2c
Fix dojo-node
nmfretz Jan 7, 2025
5ea3271
Update manifest
nmfretz Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion samourai-server/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"

Check notice on line 1 in samourai-server/docker-compose.yml

View workflow job for this annotation

GitHub Actions / Lint apps

Potentially using unsafe user in service "nginx" 

The default container user "root" can lead to security vulnerabilities. If you are using the root user, please try to specify a different user (e.g. "1000:1000") in the compose file or try to set the UID/PUID and GID/PGID environment variables to 1000.

services:
app_proxy:
Expand All @@ -24,7 +24,8 @@
ipv4_address: $APP_SAMOURAI_SERVER_DB_IP

node:
image: louneskmt/dojo-nodejs:1.16.1@sha256:49de92774ecfcb88af1dc67f8d498641d750c4ec9acaab3c448d70c4f2d4bfe7
# image: louneskmt/dojo-nodejs:1.16.1@sha256:49de92774ecfcb88af1dc67f8d498641d750c4ec9acaab3c448d70c4f2d4bfe7
image: nmfretz/dojo-nodejs:1.16.1-rpcfix@sha256:bd047ed34e04b605c662c94ed5819322c0db65b6e3425acd3607486ef28a83ce
init: true
restart: on-failure
command: "/home/node/app/wait-for-it.sh ${APP_SAMOURAI_SERVER_DB_IP}:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
Expand Down Expand Up @@ -123,7 +124,7 @@
init: true
restart: on-failure
command: /bin/sh -c "envsubst < /var/www/connect/js/conf.template.js > /var/www/connect/js/conf.js && /wait-for node:8080 --timeout=720 -- nginx"
volumes:

Check notice on line 127 in samourai-server/docker-compose.yml

View workflow job for this annotation

GitHub Actions / Lint apps

Mounted file/directory "/samourai-server/nginx/${APP_BITCOIN_NETWORK}.conf" doesn't exist 

The volume "${APP_DATA_DIR}/nginx/${APP_BITCOIN_NETWORK}.conf:/etc/nginx/sites-enabled/dojo.conf" tries to mount the file/directory "/samourai-server/nginx/${APP_BITCOIN_NETWORK}.conf", but it is not present. This can lead to permission errors!
- ${APP_DATA_DIR}/nginx/wait-for:/wait-for
- ${APP_DATA_DIR}/nginx/nginx.conf:/etc/nginx/nginx.conf
- ${APP_DATA_DIR}/nginx/${APP_BITCOIN_NETWORK}.conf:/etc/nginx/sites-enabled/dojo.conf
Expand All @@ -137,7 +138,7 @@
NODE_PREFIX_SUPPORT: support
NODE_ADMIN_KEY: $APP_SAMOURAI_SERVER_NODE_ADMIN_KEY
WHIRLPOOL_API_KEY: $APP_SAMOURAI_SERVER_WHIRLPOOL_API_KEY
ports:

Check notice on line 141 in samourai-server/docker-compose.yml

View workflow job for this annotation

GitHub Actions / Lint apps

External port mapping "$APP_SAMOURAI_SERVER_DOJO_PORT:80" 

Port mappings may be unnecessary for the app to function correctly. Docker's internal DNS resolves container names to IP addresses within the same network. External access to the web interface is handled by the app_proxy container. Port mappings are only needed if external access is required to a port not proxied by the app_proxy, or if an app needs to expose multiple ports for its functionality (e.g., DHCP, DNS, P2P, etc.).
- "$APP_SAMOURAI_SERVER_DOJO_PORT:80"
depends_on:
- node
Expand All @@ -149,7 +150,7 @@
image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a
user: "1000:1000"
restart: on-failure
volumes:

Check notice on line 153 in samourai-server/docker-compose.yml

View workflow job for this annotation

GitHub Actions / Lint apps

Mounted file/directory "/samourai-server/torrc" doesn't exist 

The volume "${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro" tries to mount the file/directory "/samourai-server/torrc", but it is not present. This can lead to permission errors!
- ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro
- ${TOR_DATA_DIR}:/data
environment:
Expand Down
10 changes: 8 additions & 2 deletions samourai-server/umbrel-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ manifestVersion: 1.1
id: samourai-server
category: bitcoin
name: Samourai Server
version: "1.16.1-hotfix-3"
version: "1.16.1-hotfix-4"
tagline: Your private backing server for Samourai Wallet
description: >-
⚠️ Whirlpool functionality no longer works due to the shutdown of Samourai's Whirlpool coordinator. Dojo functionality is unaffected.


Samourai Server is an exclusive Umbrel app that runs Samourai Dojo
and Whirlpool backing servers, and provides you easy step-by-step instructions
to connect your Samourai Wallet to them. Samourai Wallet is unrivaled in
Expand Down Expand Up @@ -32,6 +35,9 @@ path: ""
defaultUsername: ""
defaultPassword: ""
releaseNotes: >-
This update fixes a bug where users could not connect using Whirlpool GUI
This update fixes a bug where Samourai Server could not connect to Bitcoin Core v28.0.


Note that Whirlpool functionality no longer works due to the shutdown of Samourai's Whirlpool coordinator. Dojo functionality is unaffected.
submitter: Umbrel
submission: https://github.com/getumbrel/umbrel/pull/461
Loading