From 2ba13f0dbc307b93e7df52078591bf3b4115e7bb Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Fri, 28 Jul 2023 11:31:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E4=B8=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=BA=90=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=9B=B4=E6=96=B0=E6=97=B6=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=8C=85=E6=97=A0=E6=B3=95=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++- prebuilds/etc/apk/repositories.aliyun | 4 ++-- prebuilds/etc/apk/repositories.default | 4 ++-- prebuilds/etc/apk/repositories.huawei | 2 -- prebuilds/etc/apk/repositories.tencent | 2 -- prebuilds/etc/apk/repositories.ustc | 4 ++-- 6 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 prebuilds/etc/apk/repositories.huawei delete mode 100644 prebuilds/etc/apk/repositories.tencent diff --git a/Dockerfile b/Dockerfile index 4c0b9ec..6900bb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ ARG APP_VER=3.18 ARG REGISTRY_URL="docker.colovu.com/" # 设置 apt-get 源：default / ustc / aliyun -ARG APT_SOURCE=aliyun +# 当前 Alpine 3.18 阿里云缺少部分软件包 +ARG APT_SOURCE=default # 编译镜像时指定用于加速的本地软件包存储服务器地址 ARG LOCAL_URL="" diff --git a/prebuilds/etc/apk/repositories.aliyun b/prebuilds/etc/apk/repositories.aliyun index 817c5d5..75159ea 100644 --- a/prebuilds/etc/apk/repositories.aliyun +++ b/prebuilds/etc/apk/repositories.aliyun @@ -1,2 +1,2 @@ -http://mirrors.aliyun.com/alpine/v3.12/main -http://mirrors.aliyun.com/alpine/v3.12/community +http://mirrors.aliyun.com/alpine/v3.18/main +http://mirrors.aliyun.com/alpine/v3.18/community diff --git a/prebuilds/etc/apk/repositories.default b/prebuilds/etc/apk/repositories.default index 1ad9e4f..d55be9c 100644 --- a/prebuilds/etc/apk/repositories.default +++ b/prebuilds/etc/apk/repositories.default @@ -1,2 +1,2 @@ -http://dl-cdn.alpinelinux.org/alpine/v3.12/main -http://dl-cdn.alpinelinux.org/alpine/v3.12/community +http://dl-cdn.alpinelinux.org/alpine/v3.18/main +http://dl-cdn.alpinelinux.org/alpine/v3.18/community diff --git a/prebuilds/etc/apk/repositories.huawei b/prebuilds/etc/apk/repositories.huawei deleted file mode 100644 index 9640c9b..0000000 --- a/prebuilds/etc/apk/repositories.huawei +++ /dev/null @@ -1,2 +0,0 @@ -http://mirrors.huaweicloud.com/alpine/v3.12/main -http://mirrors.huaweicloud.com/alpine/v3.12/community diff --git a/prebuilds/etc/apk/repositories.tencent b/prebuilds/etc/apk/repositories.tencent deleted file mode 100644 index cce0b79..0000000 --- a/prebuilds/etc/apk/repositories.tencent +++ /dev/null @@ -1,2 +0,0 @@ -http://mirrors.cloud.tencent.com/alpine/v3.12/main -http://mirrors.cloud.tencent.com/alpine/v3.12/community diff --git a/prebuilds/etc/apk/repositories.ustc b/prebuilds/etc/apk/repositories.ustc index efbdede..f07899b 100644 --- a/prebuilds/etc/apk/repositories.ustc +++ b/prebuilds/etc/apk/repositories.ustc @@ -1,2 +1,2 @@ -http://mirrors.ustc.edu.cn/alpine/v3.12/main -http://mirrors.ustc.edu.cn/alpine/v3.12/community +http://mirrors.ustc.edu.cn/alpine/v3.18/main +http://mirrors.ustc.edu.cn/alpine/v3.18/community