From 793078b4415d46612ccc76fe5e290773c5f7bb76 Mon Sep 17 00:00:00 2001 From: ssongliu Date: Fri, 2 Dec 2022 15:39:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20docker=20daemon.jso?= =?UTF-8?q?n=20=E9=85=8D=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/docker.go | 4 ++-- frontend/src/lang/modules/en.ts | 2 ++ frontend/src/lang/modules/zh.ts | 2 ++ .../src/views/container/setting/index.vue | 21 ++++++++++++------- .../views/host/terminal/terminal/index.vue | 3 ++- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/backend/app/service/docker.go b/backend/app/service/docker.go index 9458ffa31..6da4fac92 100644 --- a/backend/app/service/docker.go +++ b/backend/app/service/docker.go @@ -85,9 +85,9 @@ func (u *DockerService) UpdateConf(req dto.DaemonJsonConf) error { deamonMap["insecure-registries"] = req.Registries } if len(req.Mirrors) == 0 { - delete(deamonMap, "insecure-mirrors") + delete(deamonMap, "registry-mirrors") } else { - deamonMap["insecure-mirrors"] = req.Mirrors + deamonMap["registry-mirrors"] = req.Mirrors } if len(req.Bip) == 0 { delete(deamonMap, "bip") diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 330d06f55..24199388f 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -415,6 +415,8 @@ export default { imageRepo: 'Image repo', repoHelper: 'Does it include a mirror repository/organization/project?', auth: 'Auth', + mirrorHelper: 'One in a row, for example:\nhttps://hub-mirror.c.163.com \nhttps://reg-mirror.qiniu.com', + registrieHelper: 'One in a row, for example:\n172.16.10.111:8081 \n172.16.10.112:8081', compose: 'Compose', composeTemplate: 'Compose template', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 871c5510c..1ac918f08 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -423,6 +423,8 @@ export default { imageRepo: '镜像仓库', repoHelper: '是否包含镜像仓库/组织/项目?', auth: '认证', + mirrorHelper: '一行一个，例：\nhttps://hub-mirror.c.163.com \nhttps://reg-mirror.qiniu.com', + registrieHelper: '一行一个，例：\n172.16.10.111:8081 \n172.16.10.112:8081', compose: '编排', composeTemplate: '编排模版', diff --git a/frontend/src/views/container/setting/index.vue b/frontend/src/views/container/setting/index.vue index c33c6fdba..334d804eb 100644 --- a/frontend/src/views/container/setting/index.vue +++ b/frontend/src/views/container/setting/index.vue @@ -13,8 +13,8 @@ {{ $t('container.mirrorsHelper') }} @@ -22,8 +22,8 @@ @@ -127,21 +127,28 @@ const onSubmitSave = async () => { if (confShowType.value === 'all') { let param = { file: dockerConf.value, - path: '/opt/1Panel/docker/config/daemon.json', + path: '/opt/1Panel/docker/conf/daemon.json', }; await updateDaemonJsonByfile(param); ElMessage.success(i18n.global.t('commons.msg.operationSuccess')); return; } + let itemMirrors = form.mirrors.split('\n'); + let itemRegistries = form.registries.split('\n'); let param = { status: form.status, bip: form.bip, - registryMirrors: form.mirrors.split('\n'), - insecureRegistries: form.registries.split('\n'), + registryMirrors: itemMirrors.filter(function (el) { + return el !== null && el !== '' && el !== undefined; + }), + insecureRegistries: itemRegistries.filter(function (el) { + return el !== null && el !== '' && el !== undefined; + }), liveRestore: form.liveRestore, cgroupDriver: form.cgroupDriver, }; await updateDaemonJson(param); + search(); ElMessage.success(i18n.global.t('commons.msg.operationSuccess')); }; diff --git a/frontend/src/views/host/terminal/terminal/index.vue b/frontend/src/views/host/terminal/terminal/index.vue index f3de2d910..da68aca93 100644 --- a/frontend/src/views/host/terminal/terminal/index.vue +++ b/frontend/src/views/host/terminal/terminal/index.vue @@ -39,7 +39,7 @@ v-model="quickCmd" clearable filterable - @blur="quickInput(quickCmd)" + @change="quickInput(quickCmd)" style="width: 25%" :placeholder="$t('terminal.quickCommand')" > @@ -267,6 +267,7 @@ function quickInput(val: any) { if (val !== '') { if (ctx) { ctx.refs[`Ref${terminalValue.value}`] && ctx.refs[`Ref${terminalValue.value}`][0].onSendMsg(val + '\n'); + quickCmd.value = ''; } } }