diff options
| author | Antonin Godard <antonin.godard@bootlin.com> | 2025-10-13 09:12:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-10-14 11:36:58 +0100 |
| commit | 4735aa8fd6242aa37d06f11470c3583a0a261f87 (patch) | |
| tree | 1bc01c290c1aa30f233fc0a75c4e3451e25abf62 /documentation | |
| parent | 5e0e1c586d7bec1febf83878769f654ef47c3fcc (diff) | |
| download | poky-4735aa8fd6242aa37d06f11470c3583a0a261f87.tar.gz | |
tools/build-docs-container: use the basename of OCI to append args
What we have is OCI = $(which $CONTAINERCMD) = /usr/bin/{docker,podman}.
So we never pass the current if conditions. Compare against the basename
of OCI to pass the checks.
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
(From yocto-docs rev: 41fc95a0e06fec29cdd8c47f75093f0a6a2df8c0)
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
| -rwxr-xr-x | documentation/tools/build-docs-container | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/tools/build-docs-container b/documentation/tools/build-docs-container index 26ea1d2e2a..f97cfc4025 100755 --- a/documentation/tools/build-docs-container +++ b/documentation/tools/build-docs-container | |||
| @@ -154,11 +154,11 @@ main () | |||
| 154 | --security-opt label=disable | 154 | --security-opt label=disable |
| 155 | ) | 155 | ) |
| 156 | 156 | ||
| 157 | if [ "$OCI" = "docker" ]; then | 157 | if [ "$(basename "$OCI")" = "docker" ]; then |
| 158 | args_run+=( | 158 | args_run+=( |
| 159 | --user="$(id -u)":"$(id -g)" | 159 | --user="$(id -u)":"$(id -g)" |
| 160 | ) | 160 | ) |
| 161 | elif [ "$OCI" = "podman" ]; then | 161 | elif [ "$(basename "$OCI")" = "podman" ]; then |
| 162 | # we need net access to fetch bitbake terms | 162 | # we need net access to fetch bitbake terms |
| 163 | args_run+=( | 163 | args_run+=( |
| 164 | --cap-add=NET_RAW | 164 | --cap-add=NET_RAW |
