Repository navigation
feat: apple is a rootstock plugin, orchd-rootstock-apple - #78
Merged
Merged
Conversation
orchd-apple becomes orchd-rootstock-apple and speaks contract 1, carrying both of its modes: xpc drives Apple's container daemon through its own run, wait, stop and delete; cli writes container command lines. orchd's core has no built-in rootstocks left. Running it live against container 1.1.0 found four things the old exec-set tests never ran: zig-clap refused --spec, so xpc runs never started (clap is gone, argv is plain); image references were matched unnormalized; the init image was pinned to a vminit the daemon no longer ships (the newest it holds is used); and stop's signal is a string since daemon 1.0 (the number is kept for older daemons). cmd now splits into words like a shell.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
orchd's core no longer has built-in rootstocks.
bare,appleandapplzare all contract-1 plugins beside orchd.orchd-rootstock-apple (was
orchd-apple)contract,check,prepare,exec-set.ORCHD_APPLE_MODEpicks the mode:xpc(default): the binary drives Apple's container daemon over XPC with its ownrun,wait,stopanddelete.cli:containercommand lines.osx: points at applz.cliexec set and the mode logic moved here from orchd's core, along with their tests.orchd
rootstock.zigis just the contract-1 plugin, found beside orchd or onPATH. The apple union and theapplecode are gone.just,release.sh, the hook and the docs follow the rename. ORCHARD.md now says every rootstock is a plugin.Live against Apple's container 1.1.0 on this Mac
orchd grow --rootstock appleon orchdi, with an alpine service whose command issh -c "echo hello from $GREETING; sleep 600". Getting xpc mode to run took four fixes, all bugs older than this PR that the exec-set tests never exercised:--spec, so no xpc run ever started. Fixed by parsing argv plainly.alpine:3.20wasn't matched to the daemon'sdocker.io/library/alpine:3.20. References are normalized now.vminit:0.31.0, which this daemon doesn't hold, so create hung. It now uses the newest vminit the daemon has, falling back to the pin.fellwaited 30 s for the keeper to kill the tree. It now sends"SIGTERM"and retries with15for older daemons.cmdwas also split on spaces, which broke the quotedsh -ccommand. It now splits like a shell.Result:
ap-hello, its log readshello from apple, the keeper shows it running, andfellremoves it in 6 s.Tests: orchd 58, apple 17, applz 6, bare 3.