Skip to content

fix: missing docker while podman is configured #446

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

Open
a-oren wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

fix: missing docker while podman is configured #446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions src/oci_image/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function execSyft(imageRef, opts = {}) {
function getSyftEnvs(dockerPath, podmanPath) {
let path = null;
if (dockerPath && podmanPath) {
path = `${dockerPath}${File.pathSeparator}${podmanPath}`;
path = `${dockerPath}${delimiter}${podmanPath}`;
} else if (dockerPath) {
path = dockerPath;
} else if (podmanPath) {
Expand Down Expand Up @@ -302,7 +302,13 @@ function podmanGetVariant(opts = {}) {
* @returns {string} - The information
*/
function dockerPodmanInfo(dockerSupplier, podmanSupplier, opts = {}) {
return dockerSupplier(opts) || podmanSupplier(opts);
try {
const result = dockerSupplier(opts);
if (result) { return result; }
} catch (_) {
// docker not available, fall through to podman
}
return podmanSupplier(opts);
}

/**
Expand Down
Loading