diff --git a/docs/setup_by_ubuntu.rst b/docs/setup_by_ubuntu.rst
index 8e419da3ee2dc3e9e8f317e912f74591028b36c6..aabfd12bcdd9a7fd800cde15bd74147a38d563a3 100644
--- a/docs/setup_by_ubuntu.rst
+++ b/docs/setup_by_ubuntu.rst
@@ -379,40 +379,49 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
 五. 安装 Windows 支持组件（如果不需要管理 windows 资产，可以直接跳过这一步）
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-因为手动安装 guacamole 组件比较复杂，这里提供打包好的 docker 使用, 启动 guacamole
-
 ::
 
-    # 安装 docker  参考官方教程 https://docs.docker.com/install/linux/docker-ce/ubuntu/
-
-    # apt-get install linux-image-extra-$(uname -r) linux-image-extra-virtual  # Ubuntu 14.04 需要先执行这一行
-
-    $ apt-get remove docker docker-engine docker.io
-    $ apt-get install apt-transport-https ca-certificates curl software-properties-common
-    $ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    $ add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-
-    ## 如果 docker 官网无法下载可以使用国内其他镜像源（以阿里云为例）
-    # curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | sudo apt-key add -
-    # add-apt-repository "deb [arch=amd64] http://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable"
+    $ apt-get -y install libtool autoconf
+    $ apt-get -y install libcairo2-dev libjpeg-turbo8-dev libpng12-dev libossp-uuid-dev
+    $ apt-get -y install libavcodec-dev libavutil-dev libswscale-dev libfreerdp-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev libvorbis-dev libwebp-dev
+    $ apt-get -y install default-jre
+    $ apt-get -y install default-jdk
 
-    $ apt-get update
-    $ apt-get install docker-ce
+    $ apt-get -y install tomcat8  # 安装 tomcat8
 
-    # 注意：这里需要修改下 http://<填写jumpserver的url地址> 例: http://192.168.244.144:8080 或者 http://192.168.244.144 不能使用 127.0.0.1 ，可以更换 registry.jumpserver.org/public/guacamole:latest
-
-    $ docker run --name jms_guacamole -d \
-      -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
-      -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-      -e JUMPSERVER_SERVER=http://<填写jumpserver的url地址> \
-      jumpserver/guacamole:latest
+    $ cd /opt
+    $ git clone https://github.com/jumpserver/docker-guacamole.git
+    $ cd docker-guacamole
+    $ tar xf guacamole-server-0.9.14.tar.gz
+    $ cd guacamole-server-0.9.14
+    $ autoreconf -fi
+    $ ./configure --with-init-dir=/etc/init.d
+    $ make && make install
+    $ cd ..
+    $ rm -rf guacamole-server-0.9.14.tar.gz guacamole-server-0.9.14 \
+    $ ldconfig
+
+    $ rm -rf /var/lib/tomcat8/webapps/*
+    $ cp /opt/docker-guacamole/guacamole-0.9.14.war /var/lib/tomcat8/webapps/ROOT.war  # guacamole client
+    $ mkdir -p /opt/guacamole /opt/guacamole/lib /opt/guacamole/extensions  # 创建 guacamole 目录
+    $ cp /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /opt/guacamole/extensions/
+    $ cp /opt/docker-guacamole/root/app/guacamole/guacamole.properties /opt/guacamole/  # guacamole 配置文件
+    $ chown -R tomcat8:tomcat8 /opt/guacamole  # 修改目录权限
+
+    $ sed -i 's/Connector port="8080"/Connector port="8081"/g' `grep 'Connector port="8080"' -rl"8080"' -rl /var/lib/tomcat8/conf/server.xml`  # 修改默认端口为 8081
+    $ sed -i 's/FINE/WARNING/g' `grep 'FINE' -rl /var/lib/tomcat8/conf/logging.properties`  # 修改 log 等级为 WARNING
+    $ echo "JUMPSERVER_SERVER=http://127.0.0.1:8080" >> /etc/default/tomcat8  # http://127.0.0.1:8080 指 jumpserver 访问地址
+    $ echo "JUMPSERVER_KEY_DIR=/opt/guacamole/keys" >> /etc/default/tomcat8
+    $ echo "GUACAMOLE_HOME=/opt/guacamole" >> /etc/default/tomcat8
+
+    $ /etc/init.d/guacd restart
+    $ /etc/init.d/tomcat8 restart
 
 这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义一下。
 
 启动成功后去 Jumpserver-会话管理-终端管理 接受[Gua]开头的一个注册，如果页面显示不正常可以等部署完成后再处理
 
 
-
 六. 配置 Nginx 整合各组件
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -515,7 +524,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
     $ ./cocod status  # 确定jumpserver已经运行，如果没有运行请重新启动coco
 
     # 如果安装了 Guacamole
-    $ docker ps  # 检查容器是否已经正常运行，如果没有运行请重新启动Guacamole
+    $ /etc/init.d/tomcat8 status  # 检查容器是否已经正常运行，如果没有运行请重新启动Guacamole
 
 服务全部启动后，访问 http://192.168.244.144
 
diff --git a/docs/setup_guacamole_cenots.rst b/docs/setup_guacamole_cenots.rst
deleted file mode 100644
index 1a4c9b6666dea0bf18c7a0d9802e5453d9d4d8e8..0000000000000000000000000000000000000000
--- a/docs/setup_guacamole_cenots.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-Centos 7
-
-$ rpm –import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
-$ rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
-
-$ yum install -y git gcc java-1.8.0-openjdk libtool epel-release tomcat
-$ yum install -y cairo-devel libjpeg-turbo-devel libpng-devel uuid-devel
-$ yum install -y freerdp-devel pango-devel libssh2-devel libvncserver-devel pulseaudio-libs-devel openssl-devel libvorbis-devel libwebp-devel
-
-$ sed -i 's/Connector port="8080"/Connector port="8081"/g' `grep 'Connector port="8080"' -rl /etc/tomcat/server.xml`
-
-cd /opt
-$ git clone https://github.com/jumpserver/docker-guacamole.git
-
-$ cd /opt/docker-guacamole/guacamole-server-0.9.14.tar.gz
-$ tar -xzf guacamole-server-0.9.14.tar.gz
-$ cd guacamole-server-0.9.14
-$ autoreconf -fi
-$ ./configure --with-init-dir=/etc/init.d
-$ make
-$ make install
-$ cd ..
-$ rm -rf guacamole-server-0.9.14.tar.gz guacamole-server-0.9.14 \
-$ ldconfig
-
-$ mkdir -p /opt/guacamole /opt/guacamole/lib /opt/guacamole/extensions
-$ rm -rf /var/lib/tomcat/webapps/ROOT.war
-$ cp /opt/docker-guacamole/guacamole-0.9.14.war /var/lib/tomcat/webapps/ROOT.war
-
-$ cp /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /opt/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar
-
-$ cp /opt/docker-guacamole/root/app/guacamole/guacamole.properties /opt/guacamole/
-
-$ echo 'export JUMPSERVER_KEY_DIR=/config/guacamole/keys' >> /etc/tomcat/tomcat.conf
-$ echo 'export GUACAMOLE_HOME=/config/guacamole' >> /etc/tomcat/tomcat.conf
-$ echo 'export JUMPSERVER_SERVER=http://172.16.64.101:8080' >> /etc/tomcat/tomcat.conf
-
-/etc/init.d/guacd start
-systemctl start tomcat
diff --git a/docs/setup_guacamole_ubuntu.rst b/docs/setup_guacamole_ubuntu.rst
deleted file mode 100644
index 2014359d5a79133d989eb55d15748f7fad214cb0..0000000000000000000000000000000000000000
--- a/docs/setup_guacamole_ubuntu.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-Ubuntu 16.04
-
-$ apt-get -y install git libtool
-
-$ apt-get -y install libcairo2-dev libjpeg-turbo8-dev libpng12-dev libossp-uuid-dev
-$ apt-get -y install libavcodec-dev libavutil-dev libswscale-dev libfreerdp-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev libvorbis-dev libwebp-dev
-
-$ apt-get -y install default-jre
-$ apt-get -y install default-jdk
-$ apt-get -y install tomcat8
-
-$ cd /opt
-$ git clone https://github.com/jumpserver/docker-guacamole.git
-$ tar xf guacamole-server-0.9.14.tar.gz
-$ cd guacamole-server-0.9.14
-$ autoreconf -fi
-$ ./configure --with-init-dir=/etc/init.d
-$ make && make install
-$ ldconfig
-
-$ rm -rf /var/lib/tomcat8/webapps/*
-$ cp /opt/docker-guacamole/guacamole-0.9.14.war /var/lib/tomcat8/webapps/ROOT.war
-
-$ mkdir -p /opt/guacamole /opt/guacamole/lib /opt/guacamole/extensions
-$ cp /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /opt/guacamole/extensions/
-$ cp /opt/docker-guacamole/root/app/guacamole/guacamole.properties /opt/guacamole/
-$ chown -R tomcat8:tomcat8 /opt/guacamole
-
-$ echo "JUMPSERVER_SERVER=http://127.0.0.1:8080" >> /etc/default/tomcat8
-$ echo "JUMPSERVER_KEY_DIR=/opt/guacamole/key" >> /etc/default/tomcat8
-$ echo "GUACAMOLE_HOME=/opt/guacamole" >> /etc/default/tomcat8
-
-$ /etc/init.d/guacd restart
-$ /etc/init.d/tomcat8 restart
diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst
index 7d292c58c7d27ccfbc0b6539f24c5c68ac5216dc..ce001564654c1a49a627a40c91a1146788dcdb36 100644
--- a/docs/step_by_step.rst
+++ b/docs/step_by_step.rst
@@ -415,45 +415,47 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
 五. 安装 Windows 支持组件（如果不需要管理 windows 资产，可以直接跳过这一步）
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-因为手动安装 guacamole 组件比较复杂，这里提供打包好的 docker 使用, 启动 guacamole
-
-5.1 Docker安装 (仅针对CentOS7，CentOS6安装Docker相对比较复杂)
-
 ::
 
-    $ yum remove docker-latest-logrotate docker-logrotate docker-selinux dockdocker-engine
-    $ yum install -y yum-utils device-mapper-persistent-data lvm2
-
-    # 添加docker官方源
-    $ yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-    $ yum makecache fast
-    $ yum install docker-ce
-
-
-    # 国内部分用户可能无法连接docker官网提供的源，这里提供阿里云的镜像节点供测试使用
-    $ yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
-    $ rpm --import http://mirrors.aliyun.com/docker-ce/linux/centos/gpg
-    $ yum makecache fast
-    $ yum -y install docker-ce
-
-    $ systemctl start docker
-    $ systemctl status docker
+    $ yum -y localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-7.noarch.rpm
+    $ rpm --import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
+    $ rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm
 
-5.2 启动 Guacamole
+    $ yum install -y git gcc java-1.8.0-openjdk libtool
+    $ yum install -y cairo-devel libjpeg-turbo-devel libpng-devel uuid-devel
+    $ yum install -y ffmpeg-devel freerdp-devel pango-devel libssh2-devel libtelnet-devel libvncserver-devel pulseaudio-libs-devel openssl-devel libvorbis-devel libwebp-devel
 
-这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义
+    $ yum install -y tomcat  # 安装 tomcat
 
-.. code:: shell
-
-
-    # 注意：这里需要修改下 http://<填写jumpserver的url地址> 例: http://192.168.244.144, 否则会出错, 带宽有限, 下载时间可能有点长，可以喝杯咖啡，撩撩对面的妹子
-    # 不能使用 127.0.0.1 ，可以更换 registry.jumpserver.org/public/guacamole:latest
-
-    $ docker run --name jms_guacamole -d \
-      -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \
-      -e JUMPSERVER_KEY_DIR=/config/guacamole/key \
-      -e JUMPSERVER_SERVER=http://<填写jumpserver的url地址> \
-      jumpserver/guacamole:latest
+    $ cd /opt
+    $ git clone https://github.com/jumpserver/docker-guacamole.git
+
+    $ cd /opt/docker-guacamole/
+    $ tar -xf guacamole-server-0.9.14.tar.gz
+    $ cd guacamole-server-0.9.14
+    $ autoreconf -fi
+    $ ./configure --with-init-dir=/etc/init.d
+    $ make && make install
+    $ cd ..
+    $ rm -rf guacamole-server-0.9.14.tar.gz guacamole-server-0.9.14
+    $ ldconfig
+
+    $ mkdir -p /config/guacamole /config/guacamole/lib /config/guacamole/extensions  # 创建 guacamole 目录
+    $ rm -rf /var/lib/tomcat/webapps/*
+    $ cp /opt/docker-guacamole/guacamole-0.9.14.war /var/lib/tomcat/webapps/ROOT.war  # guacamole client
+    $ cp /opt/docker-guacamole/guacamole-auth-jumpserver-0.9.14.jar /config/guacamole/extensions/guacamole-auth-jumpserver-0.9.14.jar
+    $ cp /opt/docker-guacamole/root/app/guacamole/guacamole.properties /config/guacamole/  # guacamole 配置文件
+    $ chown -R tomcat:tomcat /config  # 修改目录权限
+
+    $ sed -i 's/Connector port="8080"/Connector port="8081"/g' `grep 'Connector port="8080"' -rl /etc/tomcat/server.xml`  # 修改默认端口为 8081
+    $ sed -i 's/FINE/WARNING/g' `grep 'FINE' -rl /etc/tomcat/logging.properties`  # 修改 log 等级为 WARNING
+    $ echo 'JUMPSERVER_KEY_DIR=/config/guacamole/keys' >> /etc/tomcat/tomcat.conf
+    $ echo 'GUACAMOLE_HOME=/config/guacamole' >> /etc/tomcat/tomcat.conf
+    $ echo 'JUMPSERVER_SERVER=http://127.0.0.1:8080' >> /etc/tomcat/tomcat.conf  # http://127.0.0.1:8080 指 jumpserver 访问地址
+
+    $ /etc/init.d/guacd start
+    $ systemctl start tomcat
+    $ systemctl enable tomcat
 
 启动成功后去Jumpserver 会话管理-终端管理（http://192.168.244.144:8080/terminal/terminal/）接受[Gua]开头的一个注册
 
@@ -563,7 +565,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问
     $ ./cocod status  # 确定jumpserver已经运行，如果没有运行请重新启动coco
 
     # 如果安装了 Guacamole
-    $ docker ps  # 检查容器是否已经正常运行，如果没有运行请重新启动Guacamole
+    $ systemctl status tomcat  # 检查容器是否已经正常运行，如果没有运行请重新启动Guacamole
 
 服务全部启动后，访问 http://192.168.244.144，访问nginx代理的端口，不要再通过8080端口访问