From 662eae1ba481926de74174741075f7cb8a1e9abc Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Sun, 25 Jun 2023 11:48:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=8A=A0=E9=80=9F=E6=88=96=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E5=AF=BC=E8=87=B4=20Docker=20=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=90=AF=E7=94=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#1437)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/docker.go | 2 ++ frontend/src/components/upload/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/app/service/docker.go b/backend/app/service/docker.go index a05b24e93..a56748363 100644 --- a/backend/app/service/docker.go +++ b/backend/app/service/docker.go @@ -136,12 +136,14 @@ func (u *DockerService) UpdateConf(req dto.SettingUpdate) error { switch req.Key { case "Registries": + req.Value = strings.TrimRight(req.Value, ",") if len(req.Value) == 0 { delete(daemonMap, "insecure-registries") } else { daemonMap["insecure-registries"] = strings.Split(req.Value, ",") } case "Mirrors": + req.Value = strings.TrimRight(req.Value, ",") if len(req.Value) == 0 { delete(daemonMap, "registry-mirrors") } else { diff --git a/frontend/src/components/upload/index.vue b/frontend/src/components/upload/index.vue index c9f6c5044..94267da5d 100644 --- a/frontend/src/components/upload/index.vue +++ b/frontend/src/components/upload/index.vue @@ -18,13 +18,13 @@ :stroke-width="12" :percentage="uploadPrecent" > -
+
{{ $t('database.supportUpType') }} {{ $t('database.zipFormat') }}
-
+
{{ $t('website.supportUpType') }} {{ $t('website.zipFormat', [type + '.json']) }}