[Update] merge with master

docs/step_by_step.rst

@@ -159,14 +159,6 @@
     $ cd /opt
     $ git clone https://github.com/jumpserver/coco.git && cd coco && git checkout master
 
-**3.2 安装依赖**
-
-::
-
-    $ cd /opt/coco/requirements
-    $ yum -y install $(cat rpm_requirements.txt)
-    $ pip install requirements.txt
-
 
 **3.2 安装依赖**
 
@@ -312,4 +304,4 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
     service nginx start
 
 
-6.4 访问 http://192.168.244.144
\ No newline at end of file
+6.4 访问 http://192.168.244.144

docs/upgrade.rst

@@ -15,4 +15,15 @@
 
 3. 升级 Luna
 
-重新下载 release 包（https://github.com/jumpserver/luna/releases）
\ No newline at end of file
+重新下载 release 包（https://github.com/jumpserver/luna/releases）
+
+4. 升级 guacamole
+
+:: 
+
+    $ docker pull registry.jumpserver.org/public/guacamole:latest
+    $ docker stop <guacamole>
+    $ docker run -d \
+      -p 8081:8080 \
+      -e JUMPSERVER_SERVER=http://<填写本机的IP地址>:8080 \
+      registry.jumpserver.org/public/guacamole:latest