Merge branch '8ear-patch-2' into develop

docker.sbt

@@ -35,20 +35,20 @@ dockerCommands := Seq(
     "apt", "autoremove", "-y", "-q",  "&&",
     "rm", "-rf", "/var/lib/apt/lists/*", "&&",
     "(", "type", "groupadd", "1>/dev/null", "2>&1", "&&",
-      "groupadd", "-g", "1000", "cortex", "||",
-      "addgroup", "-g", "1000", "-S", "cortex",
+      "groupadd", "-g", "1001", "cortex", "||",
+      "addgroup", "-g", "1001", "-S", "cortex",
     ")", "&&",
     "(", "type", "useradd", "1>/dev/null", "2>&1", "&&",
-      "useradd", "--system", "--uid", "1000", "--gid", "1000", "cortex", "||",
-      "adduser", "-S", "-u", "1000", "-G", "cortex", "cortex",
+      "useradd", "--system", "--uid", "1001", "--gid", "1001", "cortex", "||",
+      "adduser", "-S", "-u", "1001", "-G", "cortex", "cortex",
     ")"),
   //format: on
   Cmd("ADD", "--chown=root:root", "opt", "/opt"),
   Cmd("ADD", "--chown=cortex:cortex", "var", "/var"),
   Cmd("ADD", "--chown=cortex:cortex", "etc", "/etc"),
   ExecCmd("RUN", "chmod", "+x", "/opt/cortex/bin/cortex", "/opt/cortex/entrypoint"),
   Cmd("EXPOSE", "9001"),
-  Cmd("USER", "thehive"),
+  Cmd("USER", "cortex"),
   ExecCmd("ENTRYPOINT", "/opt/cortex/entrypoint"),
   ExecCmd("CMD")
 )

package/docker/entrypoint

@@ -113,10 +113,10 @@ DOCKER_PID=$!
 
 echo config file is:
 cat $CONFIG_FILE
-su -s /bin/sh -c "cd /opt/cortex; bin/cortex \
+/bin/sh -c "cd /opt/cortex; bin/cortex \
 	-Dconfig.file=$CONFIG_FILE \
 	-Dlogger.file=/etc/cortex/logback.xml \
 	-Dpidfile.path=/dev/null \
-	$@" daemon
+	$@"
 
 test $START_DOCKER = 1 && kill ${DOCKER_PID}