From ae2335889f9218fa3af2141654f6ea37963a772b Mon Sep 17 00:00:00 2001
From: xiaoqidun <xiaoqidun@gmail.com>
Date: Fri, 29 Sep 2023 15:35:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96):=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml   | 30 +++++++++++++++++++++++-------
 DockerfileCN |  7 +++++--
 DockerfileHK |  4 ++--
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c334bca..b9d6798 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,19 +1,20 @@
 ---
 kind: pipeline
 type: docker
-name: default
+name: docker-cn
 node:
-  region: hk
+  region: cn
 steps:
   - name: build
     pull: if-not-exists
     image: debian
     commands:
+      - sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources
       - apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/*
-      - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
-      - unzip -q android-ndk-r25c-linux.zip
-      - rm -f android-ndk-r25c-linux.zip
-  - name: docker-cn
+      - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26-linux.zip
+      - unzip -q android-ndk-r26-linux.zip
+      - rm -f android-ndk-r26-linux.zip
+  - name: docker
     pull: if-not-exists
     image: plugins/docker
     settings:
@@ -24,7 +25,22 @@ steps:
       password:
         from_secret: docker_password
       dockerfile: DockerfileCN
-  - name: docker-hk
+---
+kind: pipeline
+type: docker
+name: docker-hk
+node:
+  region: cn
+steps:
+  - name: build
+    pull: if-not-exists
+    image: debian
+    commands:
+      - apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/*
+      - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26-linux.zip
+      - unzip -q android-ndk-r26-linux.zip
+      - rm -f android-ndk-r26-linux.zip
+  - name: docker
     pull: if-not-exists
     image: plugins/docker
     settings:
diff --git a/DockerfileCN b/DockerfileCN
index 4a45b8a..d6c96f4 100644
--- a/DockerfileCN
+++ b/DockerfileCN
@@ -4,6 +4,9 @@ FROM golang:1.21.1-bookworm
 # 作者信息
 LABEL MAINTAINER="xiaoqidun@gmail.com"
 
+# 使用中国软件源
+RUN sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources
+
 # 安装编译工具链
 RUN apt-get update \
     && apt-get install -y \
@@ -11,9 +14,9 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # 安装android ndk
-COPY android-ndk-r25c /usr/local/android-ndk-r25c
+COPY android-ndk-r26 /usr/local/android-ndk-r26
 
 # 环境变量
-ENV PATH=$PATH:/usr/local/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/bin
+ENV PATH=$PATH:/usr/local/android-ndk-r26/toolchains/llvm/prebuilt/linux-x86_64/bin
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.cn,direct
diff --git a/DockerfileHK b/DockerfileHK
index fd52815..b5dded5 100644
--- a/DockerfileHK
+++ b/DockerfileHK
@@ -11,9 +11,9 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # 安装android ndk
-COPY android-ndk-r25c /usr/local/android-ndk-r25c
+COPY android-ndk-r26 /usr/local/android-ndk-r26
 
 # 环境变量
-ENV PATH=$PATH:/usr/local/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/bin
+ENV PATH=$PATH:/usr/local/android-ndk-r26/toolchains/llvm/prebuilt/linux-x86_64/bin
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.aite.xyz,direct