Merge branch 'master' of https://github.com/tencentmusic/cube-studio

Conflicts: job-template/job/volcano/README.md
2025-02-17 14:40:28 +08:00 · 2022-07-26 20:48:27 +08:00 · 2022-07-26 20:48:27 +08:00 · 560ea93fb6
commit 560ea93fb6
parent 4b15fa14f5 e5fe30755a
3 changed files with 5 additions and 4 deletions
--- a/images/web/target-detection/static/README.md
+++ b/images/web/target-detection/static/README.md
@ -1,3 +1 @@
-#image-container 
-###图片管理
-![输入图片说明](http://git.oschina.net/chapsticks/image-container/raw/master/11.png?dir=0&filepath=11.png&oid=15bbf9e08a77667c1d9c31fc8ee407de3b985d6e&sha=951b770dc8b2854be0d5c60667103a870dd53f9c "在这里输入图片标题")
+
--- a/install/kubernetes/rancher/readme.md
+++ b/install/kubernetes/rancher/readme.md
@ -51,6 +51,9 @@ reset_docker.sh 是为了在机器从rancher集群踢出以后，把rancher环
 单节点部署rancher server  

 ```bash
+# 清理历史部署痕迹
+reset_docker.sh
+
 # 需要拉取镜像
 python3 all_image.py > pull_rancher_images.sh
 sh pull_rancher_images.sh
--- a/myapp/init-job-template.json
+++ b/myapp/init-job-template.json
@ -2041,4 +2041,4 @@
            }
        }
    }
-}
+}