Skip to content

Commit

Permalink
fix(backend): 修复 medium 打包问题 #1918
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzhw8 committed Nov 18, 2023
1 parent c06d373 commit d194a29
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
4 changes: 1 addition & 3 deletions dbm-ui/backend/dbm_init/medium/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

import yaml
from bkstorages.backends.bkrepo import TIMEOUT_THRESHOLD, BKGenericRepoClient, BKRepoStorage, urljoin
from django.conf import settings

from backend import env

logger = logging.getLogger("root")

Expand Down Expand Up @@ -128,7 +126,7 @@ def upload_medium(self, path, bkrepo_tmp_dir):
for file in files:
if "?" in file:
continue
if env.RUN_VER == "ieod" and "dbbackup-go" in file:
if os.getenv("RUN_VER") == "ieod" and "dbbackup-go" in file:
# 内部版本不自动上传 dbbackup
continue

Expand Down
2 changes: 1 addition & 1 deletion dbm-ui/backend/ticket/flow_manager/inner.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def _status(self) -> str:

@property
def _url(self) -> str:
return f"/database/{self.ticket.bk_biz_id}/task-history/{self.root_id}/"
return f"/database/{self.ticket.bk_biz_id}/task-history/detail/{self.root_id}/"

def check_exclusive_operations(self):
"""判断执行互斥"""
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/bk-dbm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ dependencies:
description: A Helm chart for bkdbm
name: bk-dbm
type: application
version: 1.2.0-alpha.92
appVersion: 1.2.0-alpha.92
version: 1.2.0-alpha.93
appVersion: 1.2.0-alpha.93
2 changes: 1 addition & 1 deletion helm-charts/bk-dbm/charts/dbm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.2.0-alpha.510
appVersion: 1.2.0-alpha.512
description: A Helm chart for dbm
name: dbm
type: application
Expand Down

0 comments on commit d194a29

Please sign in to comment.