fix: detect podman-docker in CONTAINER_ENGINE resolution#3620
Open
cardil wants to merge 1 commit intoknative:mainfrom
Open
fix: detect podman-docker in CONTAINER_ENGINE resolution#3620cardil wants to merge 1 commit intoknative:mainfrom
cardil wants to merge 1 commit intoknative:mainfrom
Conversation
On systems with podman-docker installed, /usr/bin/docker is a shell wrapper that exec's podman. The previous default (CONTAINER_ENGINE=docker) caused the PID limit fix in cluster.sh to never fire, leading to PID exhaustion and containerd crashes under WASM workloads. Now common.sh detects the actual runtime via 'docker --version' output and falls back to podman when docker is absent. Assisted-by: 🤖 Claude Opus/Sonnet 4.6
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: cardil The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3620 +/- ##
==========================================
- Coverage 56.30% 56.28% -0.02%
==========================================
Files 180 180
Lines 20549 20549
==========================================
- Hits 11570 11566 -4
- Misses 7778 7780 +2
- Partials 1201 1203 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When
CONTAINER_ENGINEis unset,hack/common.shpreviously defaulted todockerunconditionally. On systems with thepodman-dockerpackage installed,/usr/bin/dockeris a shell wrapper that exec's podman. This caused downstreamscripts to never fire their podman-specific workarounds, even when podman was
the actual runtime.
Changes
hack/common.sh: Replaces the single-lineexport CONTAINER_ENGINE=${CONTAINER_ENGINE:-docker}with a detection block that:CONTAINER_ENGINEif already set.dockerifdockeris found in PATH.docker --versionoutput contains "podman", switches topodman.podmanifdockeris absent butpodmanis present.Testing
This is a shell-only change in
hack/common.sh. Verified manually on a systemwith
podman-dockerinstalled —CONTAINER_ENGINEis now correctly resolved topodman.Assisted-by: 🤖 Claude Opus/Sonnet 4.6