feat:新增制品库相关配置文件模板 TencentBlueKing#5830

yaoxuwan · Dec 20, 2021 · 03b3c09 · 03b3c09
1 parent 384f51b
commit 03b3c09
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/scripts/bkenv.properties b/scripts/bkenv.properties
@@ -213,6 +213,7 @@ BK_CI_NOTIFY_WEWORK_API_URL=https://qyapi.weixin.qq.com
 BK_CI_NOTIFY_WEWORK_SEND_CHANNEL=weworkAgent
 # BK_CI_ARTIFACTORY_REALM 默认值为local,按需修改,制品库存储方式,可选值local, bkrepo
 BK_CI_ARTIFACTORY_REALM=local
+
 ##########
 # 4-微服务依赖
 ##########
@@ -310,6 +311,8 @@ BK_CI_TURBO_REDIS_PORT=$BK_CI_REDIS_PORT
 BK_REPO_API_URL=
 # BK_REPO_AUTHORIZATION无默认值. 按需修改. 如部署了蓝鲸制品库bkrepo，并且需要集成到CI，需要配置为访问bkrepo所提供的鉴权信息
 BK_REPO_AUTHORIZATION=
+# BK_REPO_GATEWAY_IP无默认值，按需修改，如部署了蓝鲸制品库bkrepo，并且需要集成到CI，需要配置bkrepo网关的IP地址
+BK_REPO_GATEWAY_IP=
 
 ##########
 # 5-api port

diff --git a/support-files/templates/#etc#ci#common.yml b/support-files/templates/#etc#ci#common.yml
@@ -100,6 +100,7 @@ auth:
   iamCallBackUser: __BK_CI_IAM_CALLBACK_USER__
   # 用户组权限申请前端跳转页面HOST
   webHost: __BK_CI_IAM_WEB_URL__
+  token: __BK_CI_APP_TOKEN__
 
 #bk esb config for cd plugin in pipeline
 esb:

diff --git a/support-files/templates/gateway#core#devops.server.conf b/support-files/templates/gateway#core#devops.server.conf
@@ -49,4 +49,7 @@ server {
 
     # 重定向
     include vhosts/devops.redirect.conf;
+
+    # 社区版bkrepo域名解析
+    include vhosts/devops.bkrepo.upstream.conf;
 }
diff --git a/support-files/templates/gateway#core#vhosts#devops.bkrepo.upstream.conf b/support-files/templates/gateway#core#vhosts#devops.bkrepo.upstream.conf
@@ -0,0 +1,3 @@
+upstream __BK_REPO_HOST__ {
+    server __BK_REPO_GATEWAY_IP__;
+}