From e5d01fb51b870c4ffe0ac3e42dacee57e2295e63 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Wed, 27 Sep 2023 15:04:00 +0800 Subject: [PATCH] fixed Helm --- .editorconfig | 2 +- .github/workflows/maven-ci.yml | 2 +- README.md | 27 ++++++++++----------------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.editorconfig b/.editorconfig index 50ec3c3f65..55c9ed3afd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,7 +10,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[*.{yml, bat}] +[*.{yaml,yml,bat}] indent_size = 2 [*.md] diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index ea8f0020ca..a27ae5452e 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -55,4 +55,4 @@ jobs: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_IMAGE: shiyindaxiaojie/sentinel-dashboard - DOCKER_VERSION: 1.8.6 + DOCKER_VERSION: v1.8.6 diff --git a/README.md b/README.md index 147b292b1b..c045c5ce86 100644 --- a/README.md +++ b/README.md @@ -127,27 +127,20 @@ java -Dserver.port=8080 \ ### Docker 部署 -调整 Maven 配置文件 `setiings.xml`,填写相关凭据。 -````xml - - - - github - - ${env.DOCKER_USERNAME} - ${env.DOCKER_PASSWORD} - ${env.DOCKER_IMAGE} - - - - -```` +本项目使用了 Spring Boot 的镜像分层特性优化了镜像的构建效率,请确保正确安装了 Docker 工具,然后执行以下命令。 -在项目根目录执行 `mvn -Pgithub -pl sentinel-dashboard jib:build -Djib.disableUpdateChecks=true` 打包为镜像。 +```bash +docker build -f docker/Dockerfile -t sentinel-dashboard:{tag} . +``` ### Helm 部署 -进入 `helm` 目录,执行 `helm install -n sentinel-dashboard sentinel .` 安装,在 K8s 环境将自动创建 Sentinel 所需的资源文件。 +以应用为中心,建议使用 Helm 统一管理所需部署的 K8s 资源描述文件,请参考以下命令完成应用的安装和卸载。 + +```bash +helm install sentinel-dashboard ./helm # 部署资源 +helm uninstall sentinel-dashboard # 卸载资源 +``` ## 如何接入