Commit graph

15 commits

Author SHA1 Message Date
GaltRanch
58ea9d907d fix(umbrel): switch bundled bitcoin-cli to Bitcoin Knots
User preference: stick with Knots rather than Core. The RPC protocol is
identical so PyBLOCK's behavior is unchanged, but the bundled binary now
matches the Knots flavor Umbrel ships in `umbrel-bitcoin`.

- dockerfile: download bitcoin-cli from
  bitcoinknots.org/files/28.x/28.1.knots20250305/ instead of bitcoincore.org.
  SHA256SUMS verification preserved.
- umbrel/umbrel-app.yml: clarify release notes mention Knots specifically.

Verified locally: bitcoin-cli.bin --version now reports
"Bitcoin Knots RPC client version v28.1.knots20250305".

Co-Authored-By: kulvex code <noreply@github.com>
2026-06-23 18:12:49 -03:00
GaltRanch
ba5e9606db fix(umbrel): bundle bitcoin-cli and lncli for mode A/B without Lite fallback
PyBLOCK's mode A (Bitcoin + Lightning) and mode B (Bitcoin only) call
bitcoin-cli and lncli directly via subprocess. The Umbrel image did not
ship those binaries, so the startup validation in PyBlock.py:1898-1909
detected the empty CLI paths and silently redirected to Lite Mode against
public APIs — defeating the point of installing PyBLOCK on a node.

Per nmfretz's review on getumbrel/umbrel-apps#5258, this takes the
"bundle the binaries inside the PyBLOCK image" path (option 2):

- dockerfile: download bitcoin-cli (Bitcoin Core 28.1) and lncli (LND
  v0.20.1-beta, matching what Umbrel ships) for both linux/amd64 and
  linux/arm64. Verifies the Bitcoin Core SHA256SUMS. Real binaries land
  at /usr/local/bin/{bitcoin-cli,lncli}.bin.
- umbrel/{bitcoin-cli,lncli}-wrapper.sh: thin shell wrappers installed
  as /usr/local/bin/{bitcoin-cli,lncli} that exec the real binary with
  -rpcconnect/-rpcuser/-rpcpassword (or --rpcserver/--tlscertpath/
  --macaroonpath for lncli) injected from the BITCOIN_RPC_* / LND_*
  env vars Umbrel provides via APP_BITCOIN_* / APP_LIGHTNING_*. They
  fail loud if those env vars are missing.
- entrypoint.sh: default BITCOIN_CLI_PATH/LND_CLI_PATH to the wrapper
  locations when the relevant RPC host env vars are set and the wrapper
  is executable, so bclock.conf / blndconnect.conf get the right
  bitcoincli / ln paths automatically.
- umbrel/: bump image tag and app version to v4.0.2 with release notes.

Local smoke test on amd64:
  bitcoin-cli.bin --version -> Bitcoin Core RPC client version v28.1.0
  lncli.bin --version       -> lncli version 0.20.1-beta
  /usr/local/bin/bitcoin-cli (no env) -> fails with "BITCOIN_RPC_HOST must be set"
  /usr/local/bin/bitcoin-cli (env set) -> dispatches to the real binary

Image grows ~70MB (mostly the Go-built lncli).

Co-Authored-By: kulvex code <noreply@github.com>
2026-06-23 18:10:00 -03:00
GaltRanch
c94d9e265e fix(umbrel): pin container UID to 1000 to fix Umbrel permission errors
Umbrel forces `user: "1000:1000"` in docker-compose, but the previous
Dockerfile let useradd assign the next-free UID. Since ubuntu:24.04 ships
a pre-existing `ubuntu` user at 1000, `pyblock` ended up as 1001, causing
permission errors on the bind-mounted config dir reported in
getumbrel/umbrel-apps#5258.

- dockerfile: remove the default `ubuntu` user and pin pyblock to UID/GID
  1000 so file ownership matches the user Umbrel runs as.
- entrypoint.sh: fail fast with a clear, actionable message when the
  config dir is not writable (covers future UID-mismatch regressions).
- umbrel/: bump image tag and app version to v4.0.1 with release notes.

Verified with `docker run --user 1000:1000` and an empty bind-mount:
all 5 config files generated successfully, ttyd serves on :6969.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-22 19:16:31 -03:00
GaltRanch
1fa1846790 Add ARM64 build dependencies to Dockerfile for multi-arch support
Install python3-dev, libgmp-dev, libffi-dev needed to compile
psutil and fastecdsa on ARM64 (Raspberry Pi / Umbrel).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-01 17:31:41 -03:00
GaltRanch
6fad893db8 Update Dockerfile for Umbrel + add multi-arch CI build
Dockerfile changes:
- Use COPY instead of git clone (build from local source)
- Add entrypoint.sh for auto-configuration from env vars
- EXPOSE 6969 and configurable via PYBLOCK_PORT env var
- Create config directory as volume mount point
- ENTRYPOINT replaces CMD for pre-launch setup

New .github/workflows/docker-build.yml:
- Multi-arch build: linux/amd64 + linux/arm64 (Raspberry Pi)
- Triggers on version tags (v*.*.*)
- Pushes to Docker Hub as curly60e/pyblock:version and :latest
- Uses QEMU + Buildx for cross-compilation
- GitHub Actions cache for faster builds

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-01 16:33:03 -03:00
GaltRanch
465826c152 Harden Dockerfile and improve ignore files
- Pin Ubuntu base image by SHA256 digest for reproducibility
- Pin ttyd to release tag 1.7.7 with --depth 1
- Add --no-cache-dir to pip install to reduce image size
- Expand .dockerignore with .env, .pickle, cache dirs, logs
- Expand .gitignore with IDE files, OS files, debug logs

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-01 12:06:48 -03:00
GaltRanch
7366e9fe9c Refactor architecture: config singleton, logging, menu system, dependencies
Major improvements across 7 areas:

- Add centralized Config singleton (config.py) replacing ~176 config
  reloads per session with a single cached load
- Add logging framework (log.py) with RotatingFileHandler, replacing
  silent except Exception: pass blocks with structured logging
- Refactor menu system (menu.py) with data-driven color selection,
  eliminating ~1,370 lines of duplicate menu functions
- Create shared/ modules extracting 7 utility functions duplicated
  between PyBlock.py and SPV/spvblock.py
- Clean dependencies: pin all versions, remove stdlib packages
  (asyncio, threading), remove unused imports
- Improve Docker: pin ubuntu:24.04, add non-root user, use venv
- Improve CI: update to actions v4/v5, add test job before publish
- Fix entry point: wrap main loop in def main(), proper module import

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-01 10:58:24 -03:00
Satoshi Nakamoto
72e1f4d69b
Update Dockerfile to install pyblock from GitHub 2025-11-29 00:01:51 +01:00
Satoshi Nakamoto
b0a794e34f
Update dockerfile 2025-01-08 22:12:09 +01:00
Satoshi Nakamoto
6db3d8524a
Update dockerfile 2023-01-04 21:07:42 +01:00
Satoshi Nakamoto
05a17e1810
Update dockerfile 2023-01-04 19:33:45 +01:00
Satoshi Nakamoto
8bd4dcd4b3
Update dockerfile 2023-01-04 19:17:02 +01:00
Satoshi Nakamoto
d42274d416
Update dockerfile 2022-12-29 20:34:02 +01:00
Satoshi Nakamoto
aaefbe70a2
Update dockerfile 2022-12-29 20:25:22 +01:00
Satoshi Nakamoto
25698fac3b
Create dockerfile 2022-12-29 01:14:41 +01:00