Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d1e18e4

Browse files
prompt: Optimize the timeout prompt when pulling application during installation (1Panel-dev#9757)
1 parent a801140 commit d1e18e4

File tree

10 files changed

+2
-12
lines changed

10 files changed

+2
-12
lines changed

‎agent/app/service/app_utils.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,6 @@ func upApp(task *task.Task, appInstall *model.AppInstall, pullImages bool) error
10281028
errMsg string
10291029
)
10301030
if pullImages && appInstall.App.Type != "php" {
1031-
//projectName := strings.ToLower(appInstall.Name)
10321031
envByte, err := files.NewFileOp().GetContent(appInstall.GetEnvPath())
10331032
if err != nil {
10341033
return err
@@ -1058,8 +1057,8 @@ func upApp(task *task.Task, appInstall *model.AppInstall, pullImages bool) error
10581057
if strings.Contains(errOur, "no such host") {
10591058
errMsg = i18n.GetMsgByKey("ErrNoSuchHost") + ":"
10601059
}
1061-
if strings.Contains(errOur, "timeout") {
1062-
errMsg = i18n.GetMsgByKey("ErrImagePullTimeOut") + ":"
1060+
if strings.Contains(errOur, "Error response from daemon") {
1061+
errMsg = i18n.GetMsgByKey("PullImageTimeout") + ":"
10631062
}
10641063
}
10651064
appInstall.Message = errMsg + errOur

‎agent/i18n/lang/en.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: 'Request timed out {{ .err }}'
6262
ErrHttpReqFailed: 'Request failed {{ .err }}'
6363
ErrNoSuchHost: 'Unable to find the requested server {{ .err }}'
6464
ErrHttpReqNotFound: 'The requested resource {{ .err }} could not be found'
65-
ErrImagePullTimeOut: 'Image pull timeout'
6665
ErrContainerNotFound: '{{ .name }} container does not exist'
6766
ErrContainerMsg: '{{ .name }} container is abnormal. Please check the log on the container page for details'
6867
ErrAppBackup: '{{ .name }} application backup failed {{ .err }}'

‎agent/i18n/lang/ja.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: 'リクエストがタイムアウトしました {{ .err }}'
6262
ErrHttpReqFailed: 'リクエストが失敗しました {{ .err }}'
6363
ErrNoSuchHost: '要求されたサーバー {{ .err }} が見つかりません'
6464
ErrHttpReqNotFound: '要求されたリソース {{ .err }} が見つかりませんでした'
65-
ErrImagePullTimeOut: 'イメージ プル タイムアウト'
6665
ErrContainerNotFound: '{{ .name }} コンテナが存在しません'
6766
ErrContainerMsg: '{{ .name }} コンテナが異常です。詳細についてはコンテナページのログを確認してください。'
6867
ErrAppBackup: '{{ .name }} アプリケーションのバックアップに失敗しました。エラー {{ .err }}'

‎agent/i18n/lang/ko.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: '요청 시간이 초과되었습니다 {{ .err }}'
6262
ErrHttpReqFailed: '요청이 실패했습니다 {{ .err }}'
6363
ErrNoSuchHost: '요청한 서버 {{ .err }}을 찾을 수 없습니다'
6464
ErrHttpReqNotFound: '요청한 리소스 {{ .err }}을 찾을 수 없습니다.'
65-
ErrImagePullTimeOut: '이미지 풀링 시간 초과'
6665
ErrContainerNotFound: '{{ .name }} 컨테이너가 존재하지 않습니다'
6766
ErrContainerMsg: '{{ .name }} 컨테이너가 비정상입니다. 자세한 내용은 컨테이너 페이지의 로그를 확인하세요.'
6867
ErrAppBackup: '{{ .name }} 애플리케이션 백업에 실패했습니다 {{ .err }}'

‎agent/i18n/lang/ms.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: 'Permintaan tamat masa {{ .err }}'
6262
ErrHttpReqFailed: 'Permintaan gagal {{ .err }}'
6363
ErrNoSuchHost: 'Tidak dapat mencari pelayan yang diminta {{ .err }}'
6464
ErrHttpReqNotFound: 'Sumber yang diminta {{ .err }} tidak dapat ditemui'
65-
ErrImagePullTimeOut: 'Tamat masa tarik imej'
6665
ErrContainerNotFound: 'Bekas {{ .name }} tidak wujud'
6766
ErrContainerMsg: Bekas '{{ .name }} adalah tidak normal. Sila semak log pada halaman kontena untuk butiran'
6867
ErrAppBackup: '{{ .name }} sandaran aplikasi gagal {{ .err }}'

‎agent/i18n/lang/pt-BR.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: 'Tempo limite da solicitação esgotado {{ .err }}'
6262
ErrHttpReqFailed: 'Falha na solicitação {{ .err }}'
6363
ErrNoSuchHost: 'Não foi possível encontrar o servidor solicitado {{ .err }}'
6464
ErrHttpReqNotFound: 'O recurso solicitado {{ .err }} não pôde ser encontrado'
65-
ErrImagePullTimeOut: 'Tempo limite de extração de imagem'
6665
ErrContainerNotFound: '{{ .name }} container não existe'
6766
ErrContainerMsg: 'O contêiner {{ .name }} está anormal. Por favor, verifique o log na página do contêiner para obter detalhes.'
6867
ErrAppBackup: '{{ .name }} falha no backup do aplicativo {{ .err }}'

‎agent/i18n/lang/ru.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: 'Истекло время ожидания запроса {{
6262
ErrHttpReqFailed: 'Запрос не выполнен {{ .err }}'
6363
ErrNoSuchHost: 'Не удалось найти запрошенный сервер {{ .err }}'
6464
ErrHttpReqNotFound: 'Запрошенный ресурс {{ .err }} не найден'
65-
ErrImagePullTimeOut: 'Истекло время ожидания извлечения изображения'
6665
ErrContainerNotFound: 'Контейнер {{ .name }} не существует'
6766
ErrContainerMsg: 'Контейнер {{ .name }} ненормален. Подробности смотрите в журнале на странице контейнера.'
6867
ErrAppBackup: '{{ .name }} резервное копирование приложения не удалось {{ .err }}'

‎agent/i18n/lang/tr.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: 'İstek zaman aşımı {{ .err }}'
6262
ErrHttpReqFailed: 'İstek başarısız {{ .err }}'
6363
ErrNoSuchHost: 'İstenen sunucu bulunamıyor {{ .err }}'
6464
ErrHttpReqNotFound: 'İstenen kaynak {{ .err }} bulunamadı'
65-
ErrImagePullTimeOut: 'Image çekme zaman aşımı'
6665
ErrContainerNotFound: '{{ .name }} konteyneri mevcut değil'
6766
ErrContainerMsg: '{{ .name }} konteyneri anormal. Lütfen ayrıntılar için konteyner sayfasındaki günlüğü kontrol edin'
6867
ErrAppBackup: '{{ .name }} uygulama yedeklemesi başarısız {{ .err }}'

‎agent/i18n/lang/zh-Hant.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: '請求逾時{{ .err }}'
6262
ErrHttpReqFailed: '請求失敗{{ .err }}'
6363
ErrNoSuchHost: '無法找到請求的伺服器{{ .err }}'
6464
ErrHttpReqNotFound: '無法找到要求的資源{{ .err }}'
65-
ErrImagePullTimeOut: '鏡像拉取逾時'
6665
ErrContainerNotFound: '{{ .name }} 容器不存在'
6766
ErrContainerMsg: '{{ .name }} 容器異常,請在容器頁面上查看日誌'
6867
ErrAppBackup: '{{ .name }} 應用備份失敗 {{ .err }}'

‎agent/i18n/lang/zh.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ ErrHttpReqTimeOut: "请求超时 {{ .err }}"
6262
ErrHttpReqFailed: "请求失败 {{ .err }}"
6363
ErrNoSuchHost: "无法找到请求的服务器 {{ .err }}"
6464
ErrHttpReqNotFound: "无法找到请求的资源 {{ .err }}"
65-
ErrImagePullTimeOut: '镜像拉取超时'
6665
ErrContainerNotFound: '{{ .name }} 容器不存在'
6766
ErrContainerMsg: '{{ .name }} 容器异常,具体请在容器页面查看日志'
6867
ErrAppBackup: '{{ .name }} 应用备份失败 {{ .err }}'

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /