Merged
Conversation
jglogan
force-pushed
the
tahoe-runner
branch
4 times, most recently
from
dcd28d4 to
748cac3
Compare
jglogan
commented
Jan 22, 2026
| if: github.repository == 'apple/container' | ||
| timeout-minutes: 60 | ||
| runs-on: [self-hosted, macos, sequoia, ARM64] | ||
| runs-on: [self-hosted, macos, tahoe, ARM64] |
Contributor
Author
There was a problem hiding this comment.
We need to select tahoe, there are no sequoia runners now.
jglogan
commented
Jan 22, 2026
| APP_ROOT=$(mktemp -d -p "${RUNNER_TEMP}") | ||
| trap 'rm -rf "${APP_ROOT}"; echo Removing data directory ${APP_ROOT}' EXIT | ||
| echo "Created data directory ${APP_ROOT}" | ||
| export NO_PROXY="${NO_PROXY},192.168.0.0/16,fe80::/10" |
Contributor
Author
There was a problem hiding this comment.
Don't send host-to-container or container-to-container requests through the proxy, for IPv4 and for IPv6 link local.
jglogan
commented
Jan 22, 2026
| var request = HTTPClientRequest(url: url) | ||
| request.method = .GET | ||
| let client = getClient() | ||
| let client = getClient(useHttpProxy: false) |
Contributor
Author
There was a problem hiding this comment.
Don't use the proxy for a host-to-contaienr request.
jglogan
commented
Jan 22, 2026
|
|
||
| @available(macOS 26, *) | ||
| @Test(.disabled("https://github.com/apple/container/issues/953")) | ||
| @Test |
Contributor
Author
There was a problem hiding this comment.
We can enable these in 26.2 I think.
jglogan
commented
Jan 22, 2026
| runArgs.append(contentsOf: args) | ||
| } | ||
|
|
||
| runArgs.append(contentsOf: getProxyEnvironment()) |
Contributor
Author
There was a problem hiding this comment.
Add proxy environment variables to run containers.
jglogan
commented
Jan 22, 2026
| var execArgs = [ | ||
| "exec" | ||
| ] | ||
| execArgs.append(contentsOf: getProxyEnvironment()) |
Contributor
Author
There was a problem hiding this comment.
Add proxy env vars for exec.
jglogan
commented
Jan 22, 2026
|
|
||
| var arguments = ["create", "--rm", "--name", name] | ||
|
|
||
| arguments.append(contentsOf: getProxyEnvironment()) |
Contributor
Author
There was a problem hiding this comment.
Add proxy env args for create.
jglogan
commented
Jan 22, 2026
| } | ||
|
|
||
| func getClient() -> HTTPClient { | ||
| func getClient(useHttpProxy: Bool) -> HTTPClient { |
Contributor
Author
There was a problem hiding this comment.
Allow requests from the integration test code to use proxy or not (rare to use proxy, test code shouldn't be sending requests off host)
dkovba
reviewed
Jan 22, 2026
jglogan
commented
Jan 22, 2026
| let (_, _, _, _) = (try? run(arguments: ["network", "rm", name])) ?? (nil, "", "", 1) | ||
| } | ||
|
|
||
| private func getProxyEnvironment() -> [String] { |
Contributor
Author
There was a problem hiding this comment.
Generate arg for run, exec, and create
dkovba
reviewed
Jan 22, 2026
dkovba
approved these changes
Jan 22, 2026
saehejkang
pushed a commit
to saehejkang/container
that referenced
this pull request
Jan 23, 2026
- Runner fleet is on 26.3 now. - Integration tests started flaking and it appears that we've been misconfiguring/not configuring proxy variables where we needed to be and it finally caught up with us. Workflow now adds appropriate exclusions for host-to-container and container-to-container network requests so they aren't all rammed through the proxy.
saehejkang
pushed a commit
to saehejkang/container
that referenced
this pull request
Jan 27, 2026
- Runner fleet is on 26.3 now. - Integration tests started flaking and it appears that we've been misconfiguring/not configuring proxy variables where we needed to be and it finally caught up with us. Workflow now adds appropriate exclusions for host-to-container and container-to-container network requests so they aren't all rammed through the proxy.
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
2 participants
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.
Type of Change
Motivation and Context
Runner fleet is on 26.3 now.
Testing