armbian/build
0
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2026-01-06 09:58:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

Use docker --version for podman detection

Browse Source
This commit is contained in:
Jesse R Codling
2025-11-25 16:03:03 -05:00
committed by Igor
parent 3fb2606d00
commit 9f164a21ce
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/functions/host/docker.sh
View File

@@ -42,6 +42,7 @@ function get_docker_info_once() {
if [[ -z "${DOCKER_INFO}" ]]; then
declare -g DOCKER_INFO
declare -g DOCKER_IN_PATH="no"
declare -g DOCKER_IS_PODMAN
# if "docker" is in the PATH...
if [[ -n "$(command -v docker)" ]]; then
@@ -53,6 +54,15 @@ function get_docker_info_once() {
DOCKER_INFO="$({ docker info 2> /dev/null && echo "DOCKER_INFO_OK"; } || true)"
declare -g -r DOCKER_INFO="${DOCKER_INFO}" # readonly
if docker --version | grep -q podman; then
DOCKER_IS_PODMAN="yes"
# when `docker` is a shim to `podman`, it will report it's version as "podman version #.#.#"
else
DOCKER_IS_PODMAN=""
fi
declare -g -r DOCKER_IS_PODMAN="${DOCKER_IS_PODMAN}" # readonly
declare -g DOCKER_INFO_OK="no"
if [[ "${DOCKER_INFO}" =~ "DOCKER_INFO_OK" ]]; then
DOCKER_INFO_OK="yes"
@@ -497,14 +507,6 @@ function docker_cli_prepare_launch() {
# shellcheck disable=SC2154 # $docker_kind: the kind of volume to mount on this OS; see mountpoints.sh
#display_alert "Handling Docker mountpoint" "${MOUNT_DIR} id: ${volume_id} - docker_kind: ${docker_kind}" "debug"
if grep -q io.containerd <<< "$DOCKER_INFO"; then
#dockerd engine has at least one io.containerd.* runtime available
DOCKER_IS_PODMAN=""
else
DOCKER_IS_PODMAN="yes"
#assume podman is emulating docker cli to add needed volume flags
fi
case "${docker_kind}" in
anonymous)
display_alert "Mounting" "anonymous volume for '${MOUNT_DIR}'" "debug"