Skip to content

Conversation

@dcantah
Copy link
Contributor

@dcantah dcantah commented Nov 7, 2025

Continue cleanup if a prior step fails. Ultimately we just want to ensure the agent conn and vm is stopped above all else.

Continue cleanup if a prior step fails. Ultimately we just want to
ensure the agent conn and vm is stopped above all else.
@dcantah dcantah merged commit 85a3544 into apple:main Nov 16, 2025
2 checks passed
richardkiene added a commit to Vas-Solutus/arca-containerization that referenced this pull request Dec 1, 2025
Sync with Apple's containerization repo (57 commits behind).

Notable upstream changes:
- LinuxContainer: "Harden" stop (apple#388)
- OCI runtime support (apple#416)
- Memory threshold monitoring (apple#427)
- FileHandle option for serial console (apple#410)
- Keep reference to vended execs (apple#408)
- Sync(2) on shutdown (apple#400)
- Fix ImageStore.prune() behavior (apple#420)
- Various stability improvements

Resolved conflicts:
- LinuxContainer.swift: Merged bootLog type change with our useNetworkNamespace
- Application.swift: Kept our service startup code (removed old log line per upstream)
- Server+GRPC.swift: Used upstream's async ManagedContainer, kept our DNS comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants