From fd0e43fb26e55b1482bae6e7c8699173391dfc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sat, 8 Jun 2024 14:48:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=B9=E5=99=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=A9=BA=E5=88=87=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/http/controllers/container_controller.go | 5 +---- scripts/install_panel.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/http/controllers/container_controller.go b/app/http/controllers/container_controller.go index d7bf06ba..fca46aa6 100644 --- a/app/http/controllers/container_controller.go +++ b/app/http/controllers/container_controller.go @@ -63,11 +63,8 @@ func (r *ContainerController) ContainerList(ctx http.Context) http.Response { endIndex = len(containers) } paged := containers[startIndex:endIndex] - if paged == nil { - paged = []types.Container{} - } - var items []any + items := make([]any, 0) for _, item := range paged { var name string if len(item.Names) > 0 { diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh index f22363a7..f168cbbe 100644 --- a/scripts/install_panel.sh +++ b/scripts/install_panel.sh @@ -122,13 +122,13 @@ Prepare_System() { if [ "${OS}" == "centos" ]; then if ${inChina}; then sed -e 's|^mirrorlist=|#mirrorlist=|g' \ - -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.cloud.tencent.com/rocky|g' \ - -e 's|^# baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.cloud.tencent.com/rocky|g' \ + -e 's|^#baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.tencent.com/rocky|g' \ + -e 's|^# baseurl=http://dl.rockylinux.org/$contentdir|baseurl=https://mirrors.tencent.com/rocky|g' \ -i.bak \ /etc/yum.repos.d/[Rr]ocky*.repo sed -e 's|^mirrorlist=|#mirrorlist=|g' \ - -e 's|^#baseurl=https://repo.almalinux.org|baseurl=https://mirrors.cloud.tencent.com|g' \ - -e 's|^# baseurl=https://repo.almalinux.org|baseurl=https://mirrors.cloud.tencent.com|g' \ + -e 's|^#baseurl=https://repo.almalinux.org|baseurl=https://mirrors.tencent.com|g' \ + -e 's|^# baseurl=https://repo.almalinux.org|baseurl=https://mirrors.tencent.com|g' \ -i.bak \ /etc/yum.repos.d/[Aa]lmalinux*.repo @@ -138,8 +138,8 @@ Prepare_System() { dnf install epel-release -y dnf config-manager --set-enabled epel if ${inChina}; then - sed -i 's|^#baseurl=https://download.example/pub|baseurl=https://mirrors.cloud.tencent.com|' /etc/yum.repos.d/epel* - sed -i 's|^# baseurl=https://download.example/pub|baseurl=https://mirrors.cloud.tencent.com|' /etc/yum.repos.d/epel* + sed -i 's|^#baseurl=https://download.example/pub|baseurl=https://mirrors.tencent.com|' /etc/yum.repos.d/epel* + sed -i 's|^# baseurl=https://download.example/pub|baseurl=https://mirrors.tencent.com|' /etc/yum.repos.d/epel* sed -i 's|^metalink|#metalink|' /etc/yum.repos.d/epel* dnf makecache -y fi @@ -153,8 +153,8 @@ Prepare_System() { dnf install -y curl wget zip unzip tar p7zip p7zip-plugins git jq git-core dos2unix podman rsyslog elif [ "${OS}" == "debian" ]; then if ${inChina}; then - sed -i 's/deb.debian.org/mirrors.cloud.tencent.com/g' /etc/apt/sources.list - sed -i 's/security.debian.org/mirrors.cloud.tencent.com/g' /etc/apt/sources.list + sed -i 's/deb.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list + sed -i 's/security.debian.org/mirrors.tencent.com/g' /etc/apt/sources.list fi apt-get update -y apt-get install -y curl wget zip unzip tar p7zip p7zip-full git jq git dos2unix podman rsyslog