Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 带端口的镜像地址解析问题 #1576 #1577

Merged
merged 2 commits into from
Sep 10, 2024
Merged

fix: 带端口的镜像地址解析问题 #1576 #1577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96f08a0
fix: 带端口的镜像地址解析问题 #1576
linxiaowu1992 Sep 5, 2024
a00641d
fix: 带端口的镜像地址解析问题 #1576
linxiaowu1992 Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apiserver/paasng/paasng/settings/__init__.py
View file
Open in desktop
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