[Buildroot] [PATCH 1/1] utils/docker-run: Allow running with Podman

[Buildroot] [PATCH 1/1] utils/docker-run: Allow running with Podman

[Fiona Klute via buildroot]

Podman is command line compatible with Docker, there's no need to
require contributors to install Docker to run checks before sending
patches.

The additional "--userns=keep-id" option is necessary because unlike
Docker Podman creates a user namespace for containers by
default. Without keep-id the repository and pre-existing output files
belong to root inside the container namespace, breaking writes,
certain Git safety checks, and possibly all access (if the user is
using a strict umask).

Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>
---
 utils/docker-run | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/utils/docker-run b/utils/docker-run
index 79694474c1..3dcabe2718 100755
--- a/utils/docker-run
+++ b/utils/docker-run
@@ -29,6 +29,16 @@ declare -a mountpoints=(
     "$(pwd)"
 )

+if command -v docker >/dev/null; then
+    DOCKER="docker"
+elif command -v podman >/dev/null; then
+    DOCKER="podman"
+    docker_opts+=( --userns=keep-id )
+else
+    echo "ERROR: Neither docker nor podman available!" >&2
+    exit 1
+fi
+
 # curl lists (and recognises and uses) other types of *_proxy variables,
 # but only those make sense for Buildroot:
 for env in all_proxy http_proxy https_proxy ftp_proxy no_proxy; do
@@ -84,4 +94,4 @@ if tty -s; then
     docker_opts+=( -t )
 fi

-exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}"
+exec ${DOCKER} run "${docker_opts[@]}" "${IMAGE}" "${@}"
--
2.45.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] utils/docker-run: Allow running with Podman

[Yann E. MORIN]

Fiona, All,

On 2024-05-31 12:44 +0200, Fiona Klute via buildroot spake thusly:
> Podman is command line compatible with Docker, there's no need to
> require contributors to install Docker to run checks before sending
> patches.
> 
> The additional "--userns=keep-id" option is necessary because unlike
> Docker Podman creates a user namespace for containers by
> default. Without keep-id the repository and pre-existing output files
> belong to root inside the container namespace, breaking writes,
> certain Git safety checks, and possibly all access (if the user is
> using a strict umask).
> 
> Signed-off-by: Fiona Klute <fiona.klute+wiwa@gmx.de>

I have a hook that validates that the author has properly signed-off
their contribution, and your sub-addressing triggered the check. Damn, I
need to test for more corner-cases!

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
>  utils/docker-run | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/utils/docker-run b/utils/docker-run
> index 79694474c1..3dcabe2718 100755
> --- a/utils/docker-run
> +++ b/utils/docker-run
> @@ -29,6 +29,16 @@ declare -a mountpoints=(
>      "$(pwd)"
>  )
> 
> +if command -v docker >/dev/null; then
> +    DOCKER="docker"
> +elif command -v podman >/dev/null; then
> +    DOCKER="podman"
> +    docker_opts+=( --userns=keep-id )
> +else
> +    echo "ERROR: Neither docker nor podman available!" >&2
> +    exit 1
> +fi
> +
>  # curl lists (and recognises and uses) other types of *_proxy variables,
>  # but only those make sense for Buildroot:
>  for env in all_proxy http_proxy https_proxy ftp_proxy no_proxy; do
> @@ -84,4 +94,4 @@ if tty -s; then
>      docker_opts+=( -t )
>  fi
> 
> -exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}"
> +exec ${DOCKER} run "${docker_opts[@]}" "${IMAGE}" "${@}"
> --
> 2.45.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot