Skip to content

Commit 3398338

Browse files
committed
feat: update docs for env config usage
Signed-off-by: Meng JiaFeng <[email protected]>
1 parent ceb1eca commit 3398338

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

docs/plugins/jenkins-pipeline.zh.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,15 @@
3939
```shell
4040
export IMAGE_REPO_PASSWORD=YOUR_IMAGE_REPO_PASSWORD
4141
export GITLAB_TOKEN=YOUR_GITLAB_TOKEN
42-
export GITLAB_SSHKEY=YOUR_REPO_PRIVATE_KEY
4342
```
4443

4544
!!! tip "提示"
4645

4746
如果是 GitHub,则这里的环境变量改成:
48-
47+
4948
```shell
5049
export IMAGE_REPO_PASSWORD=YOUR_IMAGE_REPO_PASSWORD
5150
export GITHUB_TOKEN=YOUR_GITHUB_TOKEN
52-
export GITHUB_SSHKEY=YOUR_REPO_PRIVATE_KEY
5351
```
5452

5553
然后准备 DevStream 插件配置:
@@ -70,6 +68,7 @@ tools:
7068
branch: master
7169
scmType: gitlab
7270
baseURL: YOUR_GITLAB_ADDR
71+
token: [[ env GITLAB_TOKEN ]]
7372
sourceRepo:
7473
owner: devstream-io
7574
name: dtm-repo-scaffolding-java-springboot
@@ -86,12 +85,14 @@ tools:
8685
url: git@YOUR_REPO_CLONE_ADDRESS/root/spring-demo
8786
branch: master
8887
apiURL: YOUR_JENKINS_ADDR
88+
token: [[ env GITLAB_TOKEN ]]
8989
pipeline:
9090
jobName: test-job
9191
configLocation: https://raw.githubusercontent.com/devstream-io/dtm-jenkins-pipeline-example/main/springboot/Jenkinsfile
9292
imageRepo:
9393
url: YOUR_HARBOR_ADDR
9494
user: admin
95+
password: [[ env IMAGE_REPO_PASSWORD ]]
9596
```
9697
9798
上述配置文件中使用的 GitLab、Jenkins 和 Harbor 访问地址需要替换成你的环境中实际地址。例如:
@@ -232,6 +233,7 @@ apps:
232233
repo:
233234
url: gitlab.com/root/test.git
234235
branch: main
236+
token: [[ env GITLAB_TOKEN ]]
235237
repoTemplate:
236238
url: https://github.com/devstream-io/dtm-repo-scaffolding-java-springboot.git
237239
ci:
@@ -249,6 +251,7 @@ pipelineTemplates:
249251
offline: true # 在此处设置 offline 为 true, 即开启该 jenkins-pipeline 的离线模式
250252
imageRepo:
251253
user: repoUser
254+
password: [[ env IMAGE_REPO_PASSWORD ]]
252255
```
253256

254257
使用该配置可得到以下输出:

docs/plugins/repo-scaffolding.zh.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66

77
这个插件基于你使用的代码仓库类型需要设置以下配置:
88

9+
使用该插件前去要获取对应 Scm(Github/Gitlab) 的 token,如果你不知道如何去获取这个 token,可以查看以下不同的 Scm 的获取方式
10+
911
### GitHub
1012

11-
- GITHUB_TOKEN: 在使用插件之前请先设置这个环境变量,如果你不知道如何获取这个 token,可以查看文档 [Creating a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
13+
- [Creating a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
1214

1315
### GitLab
1416

15-
- GITLAB_TOKEN: 在使用插件之前请先设置这个环境变量,如果你不知道如何获取这个 token,可以查看文档 [Personal access tokens](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html)
17+
- [Personal access tokens](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html)
1618
- `destinationRepo.baseUrl`:如果你使用的是自建的 GitLab 仓库,需要将该配置设置为自建 GItLab 的 URL 地址。
1719
- `destinationRepo.visibility`:此配置用于设置新建仓库的权限,支持的选项有 `public`, `private``internal`
1820

docs/use-cases/gitlab-jenkins-harbor/5-java-springboot-pipeline-with-gitlab-jenkins-harbor.zh.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ apps:
8585
repo:
8686
url: [[ gitlabURL ]]/root/[[ appName ]].git
8787
branch: main
88+
token: [[ env GITLAB_TOKEN ]]
8889
repoTemplate:
8990
url: https://github.com/devstream-io/dtm-repo-scaffolding-java-springboot.git
9091
ci:
@@ -99,9 +100,11 @@ pipelineTemplates:
99100
url: [[ jenkinsURL ]]
100101
user: admin
101102
enableRestart: true
103+
password: [[ env JENKINS_PASSWORD ]]
102104
imageRepo:
103105
user: admin
104106
url: [[ harborURL ]]/library
107+
password: [[ env IMAGE_REPO_PASSWORD ]]
105108
```
106109
107110
你可以将这个配置文件放到服务器上的某一个路径内,比如 `~/devstream-test/config-apps.yaml`。

docs/use-cases/gitlab-jenkins-harbor/6-gitlab-jenkins-harbor-java-springboot.zh.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ apps:
395395
repo:
396396
url: [[ gitlabURL ]]/root/[[ appName ]].git
397397
branch: main
398+
token: [[ env GITLAB_TOKEN ]]
398399
repoTemplate:
399400
url: https://github.com/devstream-io/dtm-repo-scaffolding-java-springboot.git
400401
ci:
@@ -409,9 +410,11 @@ pipelineTemplates:
409410
url: [[ jenkinsURL ]]
410411
user: admin
411412
enableRestart: true
413+
password: [[ env JENKINS_PASSWORD ]]
412414
imageRepo:
413415
user: admin
414416
url: [[ harborURL ]]/library
417+
password: [[ env IMAGE_REPO_PASSWORD ]]
415418
```
416419

417420
可以看到这里的状态配置换成了 devstream-app.state,这里需要保证和前面 tools 所使用的状态文件不是同一个。

docs/use-cases/gitops-python-flask/2-github-dtm-apps.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ apps:
3535
framework: django
3636
repo:
3737
url: github.com/[[ GITHUB_USER ]]/myapp1
38+
token: [[ env GITHUB_TOKEN ]]
3839
repoTemplate:
3940
url: github.com/devstream-io/dtm-repo-scaffolding-python-flask
4041
ci:
4142
- type: github-actions
4243
options:
4344
imageRepo:
4445
user: [[ DOCKERHUB_USER ]]
46+
password: [[ env IMAGE_REPO_PASSWORD ]]
4547
cd:
4648
- type: argocdapp
4749
```

0 commit comments

Comments
 (0)