From 03b3c09d5ab5ae1684e0812a9843251fb186d587 Mon Sep 17 00:00:00 2001
From: yaoxuwan <yaoxuwan@tencent.com>
Date: Mon, 20 Dec 2021 16:14:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20#5830?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/bkenv.properties                                       | 3 +++
 support-files/templates/#etc#ci#common.yml                     | 1 +
 support-files/templates/gateway#core#devops.server.conf        | 3 +++
 .../templates/gateway#core#vhosts#devops.bkrepo.upstream.conf  | 3 +++
 4 files changed, 10 insertions(+)
 create mode 100644 support-files/templates/gateway#core#vhosts#devops.bkrepo.upstream.conf

diff --git a/scripts/bkenv.properties b/scripts/bkenv.properties
index 4761d2238ab..3255c9b48a3 100644
--- 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
index b6bf3f7f1d2..cbd72ef673e 100644
--- 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
index f60807c9853..eaf68dd4e01 100644
--- 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
new file mode 100644
index 00000000000..5d57bb6df62
--- /dev/null
+++ b/support-files/templates/gateway#core#vhosts#devops.bkrepo.upstream.conf
@@ -0,0 +1,3 @@
+upstream __BK_REPO_HOST__ {
+    server __BK_REPO_GATEWAY_IP__;
+}
\ No newline at end of file