Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test-setup.sh: just ignore the podman-docker shim if it's installed #1312

Closed
wants to merge 2 commits into from
Closed

test-setup.sh: just ignore the podman-docker shim if it's installed #1312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97269d0
test-setup.sh: just ignore the podman-docker shim if it's installed
goneri May 10, 2024
af8bd75
Merge branch 'main' into goneri/test-setup.sh-just-ignore-the-podman-…
ssbarnea May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions tools/test-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,14 +350,7 @@ if [[ -n ${DOCKER_HOST+x} ]]; then
fi
# Detect docker and ensure that it is usable (unless SKIP_DOCKER)
DOCKER_VERSION="$(get_version docker 2>/dev/null || echo null)"
if [[ "${DOCKER_VERSION}" != 'null' ]] && [[ "${SKIP_DOCKER:-}" != '1' ]]; then

DOCKER_STDERR="$(docker --version 2>&1 >/dev/null)"
if [[ "${DOCKER_STDERR}" == *"Emulate Docker CLI using podman"* ]]; then
log error "podman-docker shim is present and we do not support it. Please remove it."
exit 1
fi

if [[ "${DOCKER_VERSION}" != 'null' ]] && [[ ! $DOCKER_VERSION =~ "podman" ]] && [[ "${SKIP_DOCKER:-}" != '1' ]]; then
if [ -n "${DOCKER_HOST:-}" ]; then
log error "Found DOCKER_HOST and this is not supported, please unset it."
exit 1
Expand Down
Loading