Commit a3199a6
authored
Fix server port when network mode is
Docker networking works differently depending on whether it's running
inside a VM or on the (linux) host itself, with VM-based installations
like Docker Desktop not supporting `host` network. What happens is
that the port is exposed on the VM rather than the actual host. Note
that this is the case for linux running Docker Desktop.
On the other hand, Docker Engine installations work just fine on
linux, but we were still configuring the Proxy to try to connect to
the wrong port.
This is PR assumes that
* all linux installations run docker engine
* all non-linux installations run on VMs
Fixes #2317host (#2353)1 parent c864276 commit a3199a6
File tree
4 files changed
+59
-11
lines changed- pkg
- container/docker
- transport
4 files changed
+59
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
291 | 291 | | |
292 | 292 | | |
293 | 293 | | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
294 | 298 | | |
295 | 299 | | |
296 | | - | |
297 | | - | |
298 | | - | |
299 | | - | |
300 | 300 | | |
301 | 301 | | |
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
305 | 305 | | |
306 | 306 | | |
307 | | - | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
308 | 321 | | |
309 | 322 | | |
310 | 323 | | |
| |||
1314 | 1327 | | |
1315 | 1328 | | |
1316 | 1329 | | |
| 1330 | + | |
| 1331 | + | |
| 1332 | + | |
1317 | 1333 | | |
1318 | 1334 | | |
1319 | 1335 | | |
| |||
1386 | 1402 | | |
1387 | 1403 | | |
1388 | 1404 | | |
1389 | | - | |
1390 | | - | |
1391 | | - | |
1392 | | - | |
| 1405 | + | |
| 1406 | + | |
| 1407 | + | |
| 1408 | + | |
| 1409 | + | |
| 1410 | + | |
| 1411 | + | |
| 1412 | + | |
| 1413 | + | |
| 1414 | + | |
| 1415 | + | |
| 1416 | + | |
| 1417 | + | |
| 1418 | + | |
| 1419 | + | |
1393 | 1420 | | |
1394 | 1421 | | |
1395 | 1422 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
321 | 321 | | |
322 | 322 | | |
323 | 323 | | |
324 | | - | |
325 | | - | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
326 | 330 | | |
327 | 331 | | |
328 | 332 | | |
| |||
0 commit comments