Commit 8e4cedc
authored
[Docker] Support rootless docker when using docker/bash.sh (apache#14590)
The `docker/bash.sh` script should omit the `--pid=host` argument and
`docker/with_the_same_user` arguments when the host's docker daemon is
running in [rootless
mode](https://docs.docker.com/engine/security/rootless/). The
`with_the_same_user` script is unnecessary in this mode, as rootless
docker daemons already use the privileges of the user.
The `--pid=host` flag is required when running in CI, and while it may
be useful when running tests locally, it is only supported for
rootless docker in versions docker versions 22.06 or
greater ([requires this
commit](moby/moby#41893)).1 parent 608d357 commit 8e4cedc
2 files changed
+23
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
337 | 337 | | |
338 | 338 | | |
339 | 339 | | |
340 | | - | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
345 | 351 | | |
346 | 352 | | |
347 | 353 | | |
| |||
460 | 466 | | |
461 | 467 | | |
462 | 468 | | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
463 | 479 | | |
464 | 480 | | |
465 | 481 | | |
| |||
473 | 489 | | |
474 | 490 | | |
475 | 491 | | |
476 | | - | |
477 | 492 | | |
478 | 493 | | |
479 | 494 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
| 31 | + | |
30 | 32 | | |
31 | 33 | | |
32 | 34 | | |
| |||
0 commit comments