Skip to content

fix: Increase XPC timeout for Machine API operations - #2006

Merged
jglogan merged 1 commit into
apple:mainfrom
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged

fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom
dev-kvt:fix/xpc-timeout

Conversation

@dev-kvt

@dev-kvtdev-kvt commented Jul 23, 2026•
edited by jglogan
Loading

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).

This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.

Testing

  • Tested locally
  • Added/updated tests
  • Added/updated docs

@dev-kvtdev-kvt mentioned this pull request Jul 23, 2026
Closed
3 tasks
jglogan
jglogan reviewed Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift Outdated
@jglogan

jglogan commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.

@dev-kvt

dev-kvt commented Jul 24, 2026

Copy link
Copy Markdown
ContributorAuthor

@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).

For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).

Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.

Please let me know if you would like me to adjust anything else!

@github-actions

github-actionsBot commented Jul 27, 2026

Copy link
Copy Markdown

Code Coverage

TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%

jglogan
jglogan approved these changes Jul 27, 2026
View reviewed changes

@jgloganjglogan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!

@jglogan
jglogan merged commit 13e976f into apple:mainJul 27, 2026
3 checks passed
@stephenlclarkestephenlclarke mentioned this pull request Jul 27, 2026
Merged
@synkathairosynkathairo mentioned this pull request Jul 29, 2026
Merged
@github-actionsgithub-actionsBot mentioned this pull request Jul 31, 2026
Merged
6 tasks
@d8vjorkd8vjork mentioned this pull request Jul 31, 2026
Open
2 tasks
andrewkomkov added a commit to getgantry/gantry that referenced this pull request Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang mentioned this pull request Aug 4, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: Increase XPC timeout for Machine API operations by dev-kvt · Pull Request #2006 · apple/container · GitHub
Skip to content
fix: Increase XPC timeout for Machine API operations - #2006
Merged
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Jul 27, 2026
Merged
fix: Increase XPC timeout for Machine API operations#2006
jglogan merged 1 commit into
apple:mainfrom 
dev-kvt:fix/xpc-timeout
Conversation
@dev-kvt
@dev-kvtdev-kvt
commented
Jul 23, 2026•

edited by jglogan

Loading

Copy link


Copy Markdown

Contributor
Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
In constrained CI environments, heavy operations such as creating/unpacking images (createMachine) and booting virtual machines (bootMachine) can take longer than the default 10-second XPC timeout. This causes intermittent test failures (e.g. XPC timeout for request to com.apple.container.core.machine-apiserver/createMachine).
This PR increases the XPC request timeouts in MachineClient.swift for create and boot operations to 120 seconds, and stop/delete operations to 60 seconds. It also cleans up TestCLIMachineCommand.swift by removing the withKnownIssue workaround wrapper on testCreateNameLongestValid, as the increased timeout resolves the underlying issue.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs
@dev-kvtdev-kvt
mentioned this pull request
Jul 23, 2026

Closed

3 tasks
jglogan
jglogan
reviewed
Jul 24, 2026
View reviewed changes
Comment threadSources/Services/MachineAPIService/Client/MachineClient.swift
Outdated

@jglogan
jglogan
commented
Jul 24, 2026

Copy link


Copy Markdown

Contributor
@dev-kvt Your commits are signed but unverified. When you update your PR, make sure you've got your signing key set up so GH can verify the commits.
@dev-kvt
dev-kvt
commented
Jul 24, 2026

Copy link


Copy Markdown

ContributorAuthor
@jglogan I have updated MachineClient.swift to remove the timeouts (timeout: nil) for list, create, boot, stop, and inspect, since their underlying handlers delegate to the container-apiserver (allowing those long-running tasks like pulling and unpacking to finish without hitting XPC timeouts).
For the local-only operations that do not call the container-apiserver, I kept sensible timeouts (the .seconds(60) timeout for deleting the local bundle directory in delete, and the default 10s timeout for simple get/set operations).
Also, thank you for pointing out the unverified commits issue! I realized I had not uploaded my local SSH key specifically as a "Signing Key" on GitHub. I have corrected that in my GitHub settings and amended the commit, so the changes in this PR should now be fully verified.
Please let me know if you would like me to adjust anything else!
@github-actions
github-actionsBot
commented
Jul 27, 2026

Copy link


Copy Markdown

Code Coverage
TierLine Coverage
Unit23.36%
Integration66.2%
Combined75.14%
jglogan
jglogan
approved these changes
Jul 27, 2026
View reviewed changes
@jgloganjglogan
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev-kvt Changes look good. Thanks, this will get rid of some silly CI build fails!
@jglogan
jglogan
merged commit 13e976f
into
apple:mainJul 27, 2026

3 checks passed

@stephenlclarkestephenlclarke
mentioned this pull request
Jul 27, 2026
 Merged

@synkathairosynkathairo
mentioned this pull request
Jul 29, 2026
 Merged

@github-actionsgithub-actionsBot
mentioned this pull request
Jul 31, 2026
 Merged

6 tasks
@d8vjorkd8vjork
mentioned this pull request
Jul 31, 2026

Open

2 tasks
andrewkomkov added a commit
to getgantry/gantry
that referenced
this pull request
Aug 1, 2026
@github-actions@andrewkomkov
feat(containers): boot containers from a custom kernel with custom bo…
e9d2df2
…ot args (#14)
apple/container **1.2.0** is out (previously tracked: `1.1.0`).
Upstream notes: https://github.com/apple/container/releases/tag/1.2.0 —
mirrored in `docs/upstream/apple-container-1.2.0.md`.
## Review checklist
- [ ] New or changed CLI flags Gantry should surface (`container
run/create/machine/build`)
- [ ] Changed `--format json` shapes the DockerKit apple transport
decodes
- [ ] Fixed upstream bugs Gantry currently works around
- [ ] `ContainerTooling.recommendedVersion` / feature gates need moving
to `1.2.0`
- [ ] MCP tools and App Intents that expose the affected commands
- [ ] README and CHANGELOG entries for whatever is adopted
Merging records the version as reviewed. Implement the adopted parts on
this branch, or merge as-is and open follow-ups.
---
<details><summary>Upstream release notes</summary>
## What's Changed
* Add TestCLISystemLogs and TestCLITermIO integration tests in new
integration test suite by @katiewasnothere in
apple/container#1879
* Restore reverted migrations, migrate last tests. by @jglogan in
apple/container#1880
* Removes obsolete CLITests directory. by @jglogan in
apple/container#1886
* Integration coverage xpc helpers by @noah-thor in
apple/container#1551
* Upgrade grpc-swift-nio-transport to 2.9.0 and remove HTTP2ConnectBuff…
by @adityabagchi24 in apple/container#1790
* Updates containerization to 0.36.0. by @jglogan in
apple/container#1912
* Use containerization version 0.37.0 by @adityaramani in
apple/container#1932
* Verify kernel archive integrity by @haoruilee in
apple/container#1703
* Add commit/issue alert to PR template. by @jglogan in
apple/container#1945
* Remove `--skip-build` from test Makefile target. by @jglogan in
apple/container#1951
* Restore `--skip-build`, enable `import testable` for release builds.
by @jglogan in apple/container#1955
* [package]: bump container-builder-shim to 0.13.0 by @saehejkang in
apple/container#1953
* Validate container ID from XPC requests by @katiewasnothere in
apple/container#1956
* Remove force unwraps on XPC error set/get by @katiewasnothere in
apple/container#1958
* Do not follow destination symlink when copying user configuration by
@katiewasnothere in apple/container#1957
* Fix machine ID length test. by @jglogan in
apple/container#1971
* Address flaky TestCLIKernelSetSerial suite. by @jglogan in
apple/container#1976
* [gitignore]: ignore vscode workspace files by @saehejkang in
apple/container#1966
* Update containerization dependency with new EXT4Unpacker func
definition by @katiewasnothere in
apple/container#1973
* Periodic dependency updates. by @jglogan in
apple/container#1981
* Use ordered journal mode for unpacked images. by @jglogan in
apple/container#1974
* Reword DNS container name resolution doc information by
@katiewasnothere in apple/container#1960
* ci: bump the github-actions group across 1 directory with 3 updates by
@dependabot[bot] in apple/container#1983
* Pass build config in when building protoc dependencies by
@katiewasnothere in apple/container#1972
* Container test fixture package by @katiewasnothere in
apple/container#1887
* Downgrade swift-collections to 1.5.1. by @jglogan in
apple/container#1984
* Use `enum` for warmup images. by @jglogan in
apple/container#1990
* Add missing dependencies to new ContainerTestSupport package by
@katiewasnothere in apple/container#1994
* Add OCI maskedPaths and readonlyPaths support to Container API. by
@jglogan in apple/container#1996
* Integration test - miscellaneous fixture and test refinements. by
@jglogan in apple/container#1993
* Use log instead of print for system start status messages by
@adityabagchi24 in apple/container#1889
* Fix BuilderStart race, parallelize `container build` tests. by
@jglogan in apple/container#2002
* Allow custom kernel boot args via --kernel-arg by @arirubinstein in
apple/container#1744
* fix: Increase XPC timeout for Machine API operations by @dev-kvt in
apple/container#2006
* Update containerization import to latest 0.40.0 by @katiewasnothere in
apple/container#2028
* Fix image env vars, build context checks, TCP/UDP port forward buffer,
and validate plugin name by @katiewasnothere in
apple/container#2027
* Update containerization import to 0.40.1 by @katiewasnothere in
apple/container#2038
## New Contributors
* @haoruilee made their first contribution in
apple/container#1703
* @arirubinstein made their first contribution in
apple/container#1744
* @dev-kvt made their first contribution in
apple/container#2006
**Full Changelog**:
apple/container@1.1.0...1.2.0
</details>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andrew <Andrew.Komkov@gmail.com>
@henrywanghenrywang
mentioned this pull request
Aug 4, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jgloganjgloganjglogan approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@dev-kvt@jglogan