diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 24698d3..67f08a5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,7 +17,9 @@ jobs: - name: download ndk run: | apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/* + wget -q -T 180 -4 https://github.com/thongtech/go-legacy-win7/releases/download/v1.26.0-2/go-legacy-win7-1.26.0-2.linux_amd64.tar.gz wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r29-linux.zip + tar -zxf go-legacy-win7-1.26.0-2.linux_amd64.tar.gz && rm -f go-legacy-win7-1.26.0-2.linux_amd64.tar.gz unzip -q android-ndk-r29-linux.zip && rm -f android-ndk-r29-linux.zip - name: docker setup uses: docker/setup-buildx-action@v3 diff --git a/DockerfileCN b/DockerfileCN index 36c7fa4..300ec2e 100644 --- a/DockerfileCN +++ b/DockerfileCN @@ -1,5 +1,5 @@ # 基础镜像 -FROM golang:1.26.0-trixie +FROM debian:trixie-slim # 作者信息 LABEL authors="xiaoqidun" @@ -10,13 +10,16 @@ RUN sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debi # 安装编译工具链 RUN apt-get update \ && apt-get install -y \ - build-essential mingw-w64 \ + git build-essential mingw-w64 \ && rm -rf /var/lib/apt/lists/* +# 安装go-legacy-win7 +COPY go-legacy-win7 /usr/local/go-legacy-win7 + # 安装android ndk COPY android-ndk-r29 /usr/local/android-ndk-r29 # 环境变量 -ENV PATH=$PATH:/usr/local/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin +ENV PATH=$PATH:/usr/local/go-legacy-win7/bin:/usr/local/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct diff --git a/DockerfileHK b/DockerfileHK index 1d21708..76b6649 100644 --- a/DockerfileHK +++ b/DockerfileHK @@ -1,5 +1,5 @@ # 基础镜像 -FROM golang:1.26.0-trixie +FROM debian:trixie-slim # 作者信息 LABEL authors="xiaoqidun" @@ -7,13 +7,16 @@ LABEL authors="xiaoqidun" # 安装编译工具链 RUN apt-get update \ && apt-get install -y \ - build-essential mingw-w64 \ + git build-essential mingw-w64 \ && rm -rf /var/lib/apt/lists/* +# 安装go-legacy-win7 +COPY go-legacy-win7 /usr/local/go-legacy-win7 + # 安装android ndk COPY android-ndk-r29 /usr/local/android-ndk-r29 # 环境变量 -ENV PATH=$PATH:/usr/local/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin +ENV PATH=$PATH:/usr/local/go-legacy-win7/bin:/usr/local/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin ENV GO111MODULE=on ENV GOPROXY=https://goproxy.aite.xyz,direct