Procházet zdrojové kódy

fix #1603 add FESS_APP_TYPE

Shinsuke Sugaya před 7 roky
rodič
revize
7ca78e8cb4

+ 11 - 0
src/main/java/org/codelibs/fess/util/ResourceUtil.java

@@ -31,6 +31,10 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.lastaflute.web.util.LaServletContextUtil;
 import org.lastaflute.web.util.LaServletContextUtil;
 
 
 public class ResourceUtil {
 public class ResourceUtil {
+    private static final String FESS_APP_TYPE = "FESS_APP_TYPE";
+
+    private static final String FESS_APP_DOCKER = "docker";
+
     protected ResourceUtil() {
     protected ResourceUtil() {
         // nothing
         // nothing
     }
     }
@@ -45,6 +49,13 @@ public class ResourceUtil {
     }
     }
 
 
     public static Path getConfPath(final String... names) {
     public static Path getConfPath(final String... names) {
+        final String fessAppType = System.getenv(FESS_APP_TYPE);
+        if (FESS_APP_DOCKER.equalsIgnoreCase(fessAppType)) {
+            final Path confPath = Paths.get("/opt/fess", names);
+            if (Files.exists(confPath)) {
+                return confPath;
+            }
+        }
         final String confPath = System.getProperty(Constants.FESS_CONF_PATH);
         final String confPath = System.getProperty(Constants.FESS_CONF_PATH);
         if (StringUtil.isNotBlank(confPath)) {
         if (StringUtil.isNotBlank(confPath)) {
             return Paths.get(confPath, names);
             return Paths.get(confPath, names);