Skip to content

Commit

Permalink
fix: 带端口的镜像地址解析问题 #1576 (#1577)
Browse files Browse the repository at this point in the history
  • Loading branch information
linxiaowu1992 authored Sep 10, 2024
1 parent 6d3c0f3 commit 6eae2e3
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions apiserver/paasng/paasng/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
from django.utils.encoding import force_bytes, force_str
from dynaconf import LazySettings, Validator
from environ import Env
from moby_distribution.registry.utils import parse_image

from .utils import (
get_database_conf,
Expand Down Expand Up @@ -1228,9 +1229,9 @@ def _build_file_handler(log_path: Path, filename: str, format: str) -> Dict:
# S-Mart 基础镜像信息
_SMART_TAG_SUFFIX = "smart"
SMART_IMAGE_NAME = f"{SMART_DOCKER_REGISTRY_NAMESPACE}/slug-pilot"
SMART_IMAGE_TAG = f'{settings.get("APP_IMAGE", "").partition(":")[-1]}-{_SMART_TAG_SUFFIX}'
SMART_IMAGE_TAG = f'{parse_image(settings.get("APP_IMAGE", "")).tag or "latest"}-{_SMART_TAG_SUFFIX}'
SMART_CNB_IMAGE_NAME = f"{SMART_DOCKER_REGISTRY_NAMESPACE}/run-heroku-bionic"
SMART_CNB_IMAGE_TAG = f'{settings.get("HEROKU_RUNNER_IMAGE", "").partition(":")[-1]}-{_SMART_TAG_SUFFIX}'
SMART_CNB_IMAGE_TAG = f'{parse_image(settings.get("HEROKU_RUNNER_IMAGE", "")).tag or "latest"}-{_SMART_TAG_SUFFIX}'

# slugbuilder build 的超时时间, 单位秒
BUILD_PROCESS_TIMEOUT = int(settings.get("BUILD_PROCESS_TIMEOUT", 60 * 15))
Expand Down

0 comments on commit 6eae2e3

Please sign in to comment.