Merge pull request #124 from vcjmhg/dev

[PTAL]#119 解决容器异常退出后再次进入后不能够重新启动容器的问题

scripts/docker-restart.sh

@@ -7,12 +7,9 @@
 # 2. 可将该脚本加入 crontab，每日凌晨运行来实现自动更新
 #
 
-isUpdate=$(docker pull b3log/solo|grep "Downloaded")
-
-if [[ -z  $isUpdate ]]
-then
-	echo This is the latest version
-else
+restart_solo(){
+	docker stop solo
+	docker rm solo
 	docker stop solo
 	docker rm solo
 	docker run --detach --name solo --network=host \
@@ -22,4 +19,36 @@ else
 	--env JDBC_DRIVER="com.mysql.cj.jdbc.Driver" \
 	--env JDBC_URL="jdbc:mysql://127.0.0.1:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC" \
        	b3log/solo --listen_port=8080 --server_scheme=http --server_host=localhost
-fi
\ No newline at end of file
+}
+
+update_solo(){
+	isUpdate=$(docker pull b3log/solo|grep "Downloaded")
+
+	if [[ -z  $isUpdate ]]
+	then
+		echo -e "\033[32m 当前solo为最新版本. \033[0m"
+	else
+		restart_solo >> /dev/null 2>&1
+		echo -e "\033[32m solo部署成功!!\033[0m"
+	fi
+}
+#检查当前容器状态，如果状态正常进行升级操作，否则重新进行部署
+update_and_test_service(){
+	isCrash=$(docker ps | grep "b3log/solo")
+	if [[ -z $isCrash ]]
+	then
+		echo -e "\033[31m solo状态异常，正重新部署...  \033[0m"
+		docker pull b3log/solo
+		restart_solo
+		sleep 5
+		isSecondCrash=$(docker ps | grep "b3log/solo")
+		if [[ -z $isSecondCrash ]]
+		then
+			echo -e "\033[31m 重新部署失败，可能原因:solo的启动参数可能有误，请仔细检查!!  \033[0m"
+		fi
+	else
+		update_solo
+	fi
+}
+
+update_and_test_service