From ac1b1916d2ef51f6da6b87437661559e404d42a6 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Sat, 22 Feb 2025 15:56:24 +0000 Subject: [PATCH] use /opt/venv only if docker/ else use path --- .../software/SPDF/config/RuntimePathConfig.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java b/src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java index 35e35a36..4172fd33 100644 --- a/src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java +++ b/src/main/java/stirling/software/SPDF/config/RuntimePathConfig.java @@ -1,6 +1,8 @@ package stirling.software.SPDF.config; import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Configuration; @@ -54,9 +56,12 @@ public class RuntimePathConfig { this.pipelineFinishedFoldersPath = finishedFoldersPath; this.pipelineDefaultWebUiConfigs = webUiConfigsPath; + boolean isDocker = isRunningInDocker(); + // Initialize Operation paths - String weasyPrintPath = "/opt/venv/bin/weasyprint"; - String unoConvertPath = "/opt/venv/bin/unoconvert"; + String weasyPrintPath = isDocker ? "/opt/venv/bin/weasyprint" : "weasyprint"; + String unoConvertPath = isDocker ? "/opt/venv/bin/unoconvert" : "unoconvert"; + // Check for custom operation paths Operations operations = properties.getSystem().getCustomPaths().getOperations(); @@ -73,4 +78,9 @@ public class RuntimePathConfig { this.weasyPrintPath = weasyPrintPath; this.unoConvertPath = unoConvertPath; } + + private boolean isRunningInDocker() { + return Files.exists(Paths.get("/.dockerenv")); + } + }