diff --git a/Dockerfile.sample b/Dockerfile.sample index 4aabdc4..46b9e84 100644 --- a/Dockerfile.sample +++ b/Dockerfile.sample @@ -3,7 +3,8 @@ FROM openjdk:8u252-jre ENV jarFileName=ContentGrabbingJi-exec.jar ENV CGJ_REDIS_URI="127.0.0.1:6379" ENV CGJ_PROXY="" -COPY ${jarFileName} /CGJ.jar RUN mkdir /data/ +COPY ${jarFileName} /CGJ.jar + CMD ["java", "-Dcgj.logsPath=/data/logs", "-jar", "/CGJ.jar", "botMode", "-botDataDir=/data"] \ No newline at end of file diff --git a/src/main/java/net/lamgc/cgj/Main.java b/src/main/java/net/lamgc/cgj/Main.java index 5b76fb6..b2d91b8 100644 --- a/src/main/java/net/lamgc/cgj/Main.java +++ b/src/main/java/net/lamgc/cgj/Main.java @@ -129,10 +129,10 @@ public class Main { if(env != null) { System.setProperty("cgj." + sysPropKey, env); return true; - } else { + } else if(defaultValue != null) { System.setProperty("cgj." + sysPropKey, defaultValue); - return false; } + return false; } @Command