From d4f5fc64b16adb0fcffadd561c5ffda63d2e05b2 Mon Sep 17 00:00:00 2001 From: Chao Wang Date: Wed, 13 Aug 2025 10:15:12 +0800 Subject: [PATCH] fix: docker and podman are optional for image analysis --- src/main/java/com/redhat/exhort/image/ImageUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/redhat/exhort/image/ImageUtils.java b/src/main/java/com/redhat/exhort/image/ImageUtils.java index af03651b..df88538e 100644 --- a/src/main/java/com/redhat/exhort/image/ImageUtils.java +++ b/src/main/java/com/redhat/exhort/image/ImageUtils.java @@ -131,8 +131,8 @@ public static JsonNode generateImageSBOM(ImageRef imageRef) static Operations.ProcessExecOutput execSyft(ImageRef imageRef) { var syft = Operations.getExecutable(SYFT, ARG_VERSION); - var docker = Operations.getExecutable(DOCKER, ARG_VERSION); - var podman = Operations.getExecutable(PODMAN, ARG_VERSION); + var docker = Operations.getCustomPathOrElse(DOCKER); + var podman = Operations.getCustomPathOrElse(PODMAN); var syftConfigPath = Environment.get(EXHORT_SYFT_CONFIG_PATH, ""); var imageSource = Environment.get(EXHORT_SYFT_IMAGE_SOURCE, ""); @@ -238,7 +238,7 @@ public static Platform getImagePlatform() { } static String hostInfo(String engine, String info) { - var exec = Operations.getExecutable(engine, ARG_VERSION); + var exec = Operations.getCustomPathOrElse(engine); var cmd = new String[] {exec, "info"}; var output = Operations.runProcessGetFullOutput(null, cmd, null);