修改文档

docs/faq_docker.rst

@@ -99,19 +99,3 @@ Docker 使用说明
     $ docker pull wojiushixiaobai/jumpserver:latest
     $ docker pull wojiushixiaobai/coco:1.4.3
     $ docker pull wojiushixiaobai/guacamole:1.4.3
-
-10. coco 与 gucamole 更新升级
-
-::
-
-    # 先到 Web 会话管理 - 终端管理 删掉所有组件
-    $ docker sop jms_coco
-    $ docker stop jms_guacamole
-    $ docker rm jms_coco
-    $ docker rm jms_guacamole
-    $ docker pull docker pull wojiushixiaobai/coco:1.4.3
-    $ docker pull wojiushixiaobai/guacamole:1.4.3
-    $ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://<Jumpserver_url> wojiushixiaobai/coco:1.4.3
-    $ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> wojiushixiaobai/guacamole:1.4.3
-
-    # 到 Web 会话管理 - 终端管理 接受新的注册

docs/start_automatically.rst

 开机自启
 ------------------
 
-设置 Jumpserver 自启
+正常部署设置自启
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ::
 
@@ -59,3 +60,62 @@
     # 写入 rc.local
     $ chmod +x /etc/rc.local
     $ echo "sh /opt/start_jms.sh" >> /etc/rc.local
+
+
+Docker 组件部署设置自启
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+    # 启动
+    $ vim /opt/start_jms.sh
+
+    #!/bin/bash
+    set -e
+
+    # 项目安装位置，默认是/opt
+    Project=/opt
+
+    pid=`ps -ef | grep -v grep | egrep '(gunicorn|celery|beat)' | awk '{print $2}'`
+    if [ "$pid" != "" ]; then
+        echo -e "\033[31m 检测到 Jumpserver 进程未退出，结束中 \033[0m"
+        cd /opt && sh stop_jms.sh
+        sleep 5s
+        pid1=`ps -ef | grep -v grep | egrep '(gunicorn|celery|beat)' | awk '{print $2}'`
+        if [ "$pid1" != "" ]; then
+            echo -e "\033[31m 检测到 Jumpserver 进程任未退出，强制结束中 \033[0m"
+            kill -9 ${pid1}
+        fi
+    fi
+
+    echo -e "\033[31m 正常启动 Jumpserver ... \033[0m"
+    source $Project/py3/bin/activate
+    cd $Project/jumpserver && ./jms start -d
+    docker start jms_coco
+    docker start jms_guacamole
+
+    exit 0
+
+::
+
+    # 停止
+    $ vim /opt/stop_jms.sh
+
+    #!/bin/bash
+    set -e
+
+    # 项目安装位置，默认是/opt
+    Project=/opt
+
+    docker stop jms_coco
+    docker stop jms_guacamole
+    source $Project/py3/bin/activate
+    cd $Project/jumpserver && ./jms stop
+
+    exit 0
+
+::
+
+    # 写入 rc.local
+    $ chmod +x /etc/rc.local
+    $ echo "sh /opt/start_jms.sh" >> /etc/rc.local

docs/upgrade.rst

@@ -137,6 +137,23 @@
     $ /etc/init.d/guacd start
     $ sh /config/tomcat8/bin/startup.sh
 
+5. Docker 部署 coco guacamole 升级说明
+
+::
+
+    # 先到 Web 会话管理 - 终端管理 删掉所有组件
+    $ docker sop jms_coco
+    $ docker stop jms_guacamole
+    $ docker rm jms_coco
+    $ docker rm jms_guacamole
+    $ docker pull docker pull wojiushixiaobai/coco:1.4.3
+    $ docker pull wojiushixiaobai/guacamole:1.4.3
+    $ docker run --name jms_coco -d -p 2222:2222 -p 5000:5000 -e CORE_HOST=http://<Jumpserver_url> wojiushixiaobai/coco:1.4.3
+    $ docker run --name jms_guacamole -d -p 8081:8081 -e JUMPSERVER_SERVER=http://<Jumpserver_url> wojiushixiaobai/guacamole:1.4.3
+
+    # 到 Web 会话管理 - 终端管理 接受新的注册
+
+
 切换分支或releases包升级
 -------------------------------