From 0f4dde01938295b2b5b26a07e2f4fda608e13948 Mon Sep 17 00:00:00 2001 From: Rudo Kemper Date: Mon, 8 Jun 2026 12:37:37 -0400 Subject: [PATCH 1/3] Fix tox-docker issues --- .circleci/config.yml | 4 ++++ tox.ini | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ac7297b..413db02b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,3 +50,7 @@ jobs: command: tox -- -v environment: PIP_UPLOADED_PRIOR_TO: P7D + # Skip tox-docker's NetworkSettings.Gateway lookup (broken on newer + # Docker in ubuntu-2404:current). machine-executor reaches containers + # via localhost anyway. + TOX_DOCKER_GATEWAY: localhost diff --git a/tox.ini b/tox.ini index d326d305..2065d2c4 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,6 @@ environment = PORT=10010 expose = TOX_DOCKER_GCS_PORT=10010/tcp -network_mode = bridge [testenv:arcgis] deps = From c2e7377f11723e48ec06e4ad88335b98156f3b7d Mon Sep 17 00:00:00 2001 From: Rudo Kemper Date: Mon, 8 Jun 2026 12:41:53 -0400 Subject: [PATCH 2/3] Restore network_mode, out of scope change --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 2065d2c4..d326d305 100644 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,7 @@ environment = PORT=10010 expose = TOX_DOCKER_GCS_PORT=10010/tcp +network_mode = bridge [testenv:arcgis] deps = From 992dceaf5a0958da21313ee94943e9d208555fc8 Mon Sep 17 00:00:00 2001 From: Rudo Kemper Date: Tue, 9 Jun 2026 14:22:13 -0400 Subject: [PATCH 3/3] Note that this is a workaround --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 413db02b..a06b6df3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,5 +52,6 @@ jobs: PIP_UPLOADED_PRIOR_TO: P7D # Skip tox-docker's NetworkSettings.Gateway lookup (broken on newer # Docker in ubuntu-2404:current). machine-executor reaches containers - # via localhost anyway. + # via localhost anyway. Workaround until https://github.com/tox-dev/tox-docker/pull/196 + # is merged and released. TOX_DOCKER_GATEWAY: localhost