Skip to content

feat: s6-overlay service supervision + wdocker CLI#136

Merged
evangineer merged 10 commits intomainfrom
feat/s6-overlay
Mar 13, 2026
Merged

feat: s6-overlay service supervision + wdocker CLI#136
evangineer merged 10 commits intomainfrom
feat/s6-overlay

Conversation

@evangineer
Copy link
Copy Markdown
Contributor

@evangineer evangineer commented Mar 12, 2026

Summary

  • Replaces tini + entrypoint.sh with s6-overlay v3.2.0.2 as PID 1, providing proper service supervision with automatic restart on crash
  • Adds @theweave/wdocker v0.15.3 CLI tool (wdocker + wdaemon binaries) for managing always-on Moss group nodes, as documented in the EdgeNode Moss Guide
  • Adds Node.js (current) + npm to the image to support wdocker

Services (s6-rc.d)

Service Type Description
setup oneshot Init: dirs, symlinks, chown, config copy + validation
conductor longrun Holochain conductor — auto-restarts on crash
log-sender longrun Waits for config.json, then runs log-sender — auto-restarts on crash
logrotate-cron longrun Daily logrotate loop

Notable details

  • conductor and log-sender now automatically restart if they crash (previously relied on Docker restart policy / bash polling loop)
  • log-sender waits for /etc/log-sender/config.json before starting — no more bash polling loop in monitor_log_sender()
  • wdocker package has a known upstream packaging bug where file: workspace paths are used for @theweave/utils, @theweave/group-client, and @theweave/api — worked around with a jq patch of package.json before npm install
  • entrypoint.sh is no longer used as the container entrypoint; init logic lives in s6-overlay/s6-rc.d/setup/init.sh

Test plan

  • All 35 tests pass (1 expected skip: multi_install needs initZomeCalls-compatible hApp)
  • s6-overlay services start in correct order (setup → conductor/log-sender/logrotate-cron)
  • wdocker --version returns 0.15.3
  • wdaemon binary present
  • Manual: wdocker run <name> creates a conductor and joins a Moss group

🤖 Generated with Claude Code

evangineer and others added 9 commits March 11, 2026 16:23
@evangineer @claude
chore: consolidate to single edgenode image with HC 0.6.1-rc.3 + log-…
cd385fe 
…sender

- Merge Dockerfile.hc-0.6.1-rc.1 and Dockerfile.unyt into docker/Dockerfile
- Bump Holochain to 0.6.1-rc.3
- Include log-sender v0.1.4 in base image (no longer a separate unyt variant)
- Simplify docker-compose.yml to single edgenode + log-collector service
- Delete legacy Dockerfiles (hc-0.5.6, hc-0.6.0-go-pion, hc-0.6.0-custom-go-pion, unyt)
- Delete legacy compose files and MULTI_IMAGE_STRATEGY.md
- Simplify run_tests_multi.sh and build-images.sh for single image
- Simplify release.yml: one build job, tags as both version and latest
- Update all BATS tests: remove is_unyt()/is_hc_0_6_0() version gates

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
chore: bump log-sender to v0.1.5 with arch-specific binaries
e2b019e 
v0.1.5 ships separate log-sender-x86_64 and log-sender-aarch64 assets,
enabling proper arm64 support.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
fix: update kando to v0.17.1 and fix test issues for HC 0.6.1-rc.3
32b5493 
- Update kando fixtures to v0.17.1 (compatible with HC 0.6.1-rc.3 bundle manifest v0)
  - New SHA256: a4cdee64fe32720077e0aade94630f24d0da5e91da33ccbe5bfd894d9d359f28
  - Remove initZomeCalls (profiles zome API changed)
- Skip webhapp tests pending a HC 0.6.1-rc.3 compatible rhymez release
  (rhymez 0.1.5 uses bundle manifest v1, HC 0.6.1-rc.3 expects v0)
- Fix integration_data_pipeline.bats: use real conductor config instead of
  empty dummy file (log-sender panicked reading data_root_path from empty YAML)
- Fix log_sender_debug.bats: allow exit 124 (timeout) as success for
  'timeout 5 log-sender service' step
- Add mkdir -p /usr/local/bin to Dockerfile log-sender layer (build fix)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
fix: rewrite integration_data_pipeline tests to match log-sender actu…
3070539 
…al behaviour

Log-sender v0.1.5 only:
1. Sends dbSize proofs (one per DHT database per interval)
2. Forwards JSONL entries with k="fetchedOps" from --report-path files

Previous tests wrote k="metric" JSONL (ignored by log-sender) and queried
`WHERE source LIKE 'integration_test_%'` — but the metrics table has no
source column. Both issues meant wait_for_database_data always returned 0.

Fixes:
- Use k="fetchedOps" in all test JSONL (the type log-sender actually forwards)
- Replace source-filtered DB queries with METRICS_BASELINE delta approach:
  @setup captures total metric count; tests assert count increased by >= N
- Redesign "data integrity" test to verify proof timestamp validity and
  drone registration rather than non-existent metric_value/source fields
- Redesign "cleanup" test to verify fresh re-registration still works
  (source-based DELETE was a no-op with no source column)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
docs: update docker/README.md for single-image consolidation
3da8c4c 
- Add log_tool to Container Commands section (log-sender now in every image)
- Update kando sandbox example from v0.13.0 to v0.17.1
- Fix Conductor Configuration: replace incorrect 'lair_root must be empty'
  with actual keystore path (/var/local/lib/holochain/ks)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
fix: replace rhymez webhapp fixtures with kando v0.17.1 webhapp
2efc2fd 
kando v0.17.1 ships a .webhapp and is compatible with HC 0.6.1-rc.3.
- Add kando-webhapp.json (inner .happ SHA256: a4cdee64...)
- Add kando-webhapp-badsha.json (wrong SHA256 to test checksum failure)
- Add kando-webhapp-webhappsha.json (whole .webhapp SHA256 to test
  that providing the bundle hash rather than the inner .happ hash fails)
- Remove skips from webhapp.bats and update to use new fixtures

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
docs: update TESTING.md for webhapp and multi_install status
c03a3b9 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
fix: add log-sender.log to logrotate config
4fcca0a 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer @claude
feat: add s6-overlay service supervision and wdocker CLI
318e25e 
- Replace tini+entrypoint.sh with s6-overlay v3.2.0.2 as PID 1 init
- Services: setup (oneshot), conductor, log-sender, logrotate-cron (longruns)
- conductor and log-sender auto-restart on crash via s6 supervision
- log-sender waits for config.json before starting (no polling loop)
- Removes monitor_log_sender() bash loop from entrypoint
- Add nodejs + npm + @theweave/wdocker@0.15.3 CLI tool
  - Workaround for broken file: workspace deps in published package
    via jq patch of package.json before npm install

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer evangineer requested review from SIR-R0B and zippy March 12, 2026 21:28
@evangineer evangineer self-assigned this Mar 12, 2026
@evangineer evangineer linked an issue Mar 12, 2026 that may be closed by this pull request
Add wdocker to the EdgeNode container image #128
Closed
@evangineer @claude
docs: update README for s6-overlay and wdocker
7f7fe77 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@evangineer evangineer merged commit f86b115 into main Mar 13, 2026
@evangineer evangineer deleted the feat/s6-overlay branch March 13, 2026 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zippy zippy Awaiting requested review from zippy

@SIR-R0B SIR-R0B Awaiting requested review from SIR-R0B

Assignees

@evangineer evangineer

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add wdocker to the EdgeNode container image

1 participant

@evangineer