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}" "${@}"