Merge origin/master

docker/Dockerfile

@@ -53,4 +53,4 @@ VOLUME ["/opt/yacy_search_server/DATA"]
 USER yacy
 
 # Start yacy in debug mode (-d) to display console logs and to wait for yacy process
-CMD sh /opt/yacy_search_server/startYACY.sh -d
+CMD ["/bin/sh","/opt/yacy_search_server/startYACY.sh","-d"]

docker/Dockerfile.alpine

@@ -85,4 +85,4 @@ VOLUME ["/opt/yacy_search_server/DATA"]
 USER yacy
 
 # Start yacy in debug mode (-d) to display console logs and to wait for yacy process
-CMD sh /opt/yacy_search_server/startYACY.sh -d
+CMD ["/bin/sh","/opt/yacy_search_server/startYACY.sh","-d"]

docker/Readme.md

@@ -140,6 +140,10 @@ And configure the pkcs12XXX properties accordingly :
 
 	docker exec [your_container_name] /opt/yacy_search_server/stopYACY.sh
 	
+* OR run :
+
+	docker stop [your_container_name]
+	
 ### Upgrade
 
 You can upgrade your YaCy container the Docker way with the following commands sequence.

startYACY.sh

@@ -224,10 +224,16 @@ else
 	echo "**  STOP         YaCy: execute stopYACY.sh and wait some seconds             **"
     echo "**  GET HELP for YaCy: see http://wiki.yacy.net and http://forum.yacy.de     **"
 	echo "*******************************************************************************"
-	echo " >> YaCy started as daemon process. Administration at http://localhost:$PORT << "
-	eval $cmdline
-	if [ "$TAILLOG" -eq "1" -a ! "$DEBUG" -eq "1" ];then
-		sleep 1
-		tail -f DATA/LOG/yacy00.log
+	if [ $DEBUG -eq 1 ] #debug
+	then
+		# with exec the java process become the main process and will receive signals such as SIGTERM
+		exec $cmdline
+	else
+		echo " >> YaCy started as daemon process. Administration at http://localhost:$PORT << "
+		eval $cmdline
+		if [ "$TAILLOG" -eq "1" -a ! "$DEBUG" -eq "1" ];then
+			sleep 1
+			tail -f DATA/LOG/yacy00.log
+		fi
 	fi
 fi