fix(macos): put the gateway address in the Docker CLI proxy config
tracker-policy-pr / check-pr (pull_request) Successful in 10s
test / integration-docker (pull_request) Successful in 16s
lint / lint (push) Successful in 49s
test / unit (pull_request) Successful in 1m40s
test / integration-firecracker (pull_request) Failing after 2m50s
test / coverage (pull_request) Has been skipped
test / publish-infra (pull_request) Has been skipped
tracker-policy-pr / check-pr (pull_request) Successful in 10s
test / integration-docker (pull_request) Successful in 16s
lint / lint (push) Successful in 49s
test / unit (pull_request) Successful in 1m40s
test / integration-firecracker (pull_request) Failing after 2m50s
test / coverage (pull_request) Has been skipped
test / publish-infra (pull_request) Has been skipped
This is the layer that actually decides it, and it was in the script from the start: ~/.docker/config.json's proxies block is what the Docker CLI copies into every container it starts. Being client-side it beats the podman service outright, which is why containers.conf `env`, http_proxy=false, and the service environment each looked correct on disk and changed nothing a nested container saw. Also corrects the comment on the service-env substitution, which claimed to be the one place the address sticks. It is not; it covers podman's own pulls and non-CLI API clients. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -174,12 +174,19 @@ class TestInitScript(unittest.TestCase):
|
||||
self.assertIn('$2 == name { print $1; exit }', self.script)
|
||||
self.assertIn('value.replace(name, ip)', self.script)
|
||||
|
||||
def test_docker_cli_proxy_config_uses_the_address(self) -> None:
|
||||
"""The Docker CLI copies ~/.docker/config.json's proxies block into
|
||||
every container it starts. Being client-side it beats the podman
|
||||
service, so this — not containers.conf — is what decides whether a
|
||||
nested container can reach the proxy."""
|
||||
block = self.script[self.script.index('"proxies"'):]
|
||||
self.assertIn('"httpProxy": proxy.replace(name, ip)', block)
|
||||
self.assertIn('"httpsProxy": proxy.replace(name, ip)', block)
|
||||
self.assertIn('"noProxy": no_proxy', block)
|
||||
|
||||
def test_substitutes_the_address_into_the_service_environment(self) -> None:
|
||||
"""The compat API injects proxy settings from the daemon environment
|
||||
after containers.conf is applied, so neither the env list nor
|
||||
http_proxy=false can override it — the same blind spot it has for
|
||||
hosts_file. Substituting before the service starts is the only place
|
||||
the address sticks."""
|
||||
"""Covers what the Docker CLI does not stamp: podman's own registry
|
||||
pulls, and containers created through the API by another client."""
|
||||
launch = self.script[self.script.index("podman system service"):]
|
||||
self.assertNotIn("$GATEWAY_NAME", launch) # substitution precedes it
|
||||
setup = self.script[:self.script.index("podman system service")]
|
||||
@@ -196,9 +203,11 @@ class TestInitScript(unittest.TestCase):
|
||||
def test_keeps_the_gateway_name_in_no_proxy(self) -> None:
|
||||
"""NO_PROXY is matched against what a client asks for, and code inside
|
||||
a nested container still says bot-bottle-gateway."""
|
||||
no_proxy = self.script[self.script.index('for var in ("NO_PROXY"'):]
|
||||
self.assertIn('entries.append(f"{var}={value}")', no_proxy)
|
||||
self.assertNotIn("replace(name, ip)", no_proxy)
|
||||
start = self.script.index('for var in ("NO_PROXY"')
|
||||
loop = self.script[start:self.script.index("path = Path(", start)]
|
||||
self.assertIn('entries.append(f"{var}={value}")', loop)
|
||||
self.assertNotIn("replace(name, ip)", loop)
|
||||
self.assertIn('"noProxy": no_proxy', self.script)
|
||||
|
||||
def test_fails_closed_without_a_gateway_address(self) -> None:
|
||||
self.assertIn('[ -n "$gateway_ip" ] || {', self.script)
|
||||
|
||||
Reference in New Issue
Block a user