feat(升级版本): 升级版本

.drone.yml

@@ -1,37 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-node:
-  region: hk
-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-r25c-linux.zip
-      - unzip -q android-ndk-r25c-linux.zip
-      - rm -f android-ndk-r25c-linux.zip
-  - name: docker-cn
-    pull: if-not-exists
-    image: plugins/docker
-    settings:
-      repo: ccr.ccs.tencentyun.com/xiaoqidun/goenv
-      registry: ccr.ccs.tencentyun.com
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: DockerfileCN
-  - name: docker-hk
-    pull: if-not-exists
-    image: plugins/docker
-    settings:
-      repo: hkccr.ccs.tencentyun.com/xiaoqidun/goenv
-      registry: hkccr.ccs.tencentyun.com
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: DockerfileHK

.gitea/workflows/build.yaml

@@ -0,0 +1,42 @@
+on: [push, workflow_dispatch]
+jobs:
+  build:
+    runs-on: cn
+    strategy:
+      matrix:
+        include:
+          - dockerfile: DockerfileCN
+            registry: ccr.ccs.tencentyun.com
+            image: ccr.ccs.tencentyun.com/xiaoqidun/goenv:latest
+          - dockerfile: DockerfileHK
+            registry: hkccr.ccs.tencentyun.com
+            image: hkccr.ccs.tencentyun.com/xiaoqidun/goenv:latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+      - 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://dl.google.com/android/repository/android-ndk-r29-linux.zip
+          unzip -q android-ndk-r29-linux.zip && rm -f android-ndk-r29-linux.zip
+      - name: docker setup
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: |
+            "env.http_proxy=${{ env.HTTP_PROXY }}"
+            "env.https_proxy=${{ env.HTTPS_PROXY }}"
+            "env.no_proxy=${{ env.NO_PROXY }}"
+      - name: docker login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ matrix.registry }}
+          username: ${{ secrets.docker_username }}
+          password: ${{ secrets.docker_password }}
+      - name: docker build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          provenance: false
+          file: ${{ matrix.dockerfile }}
+          tags: ${{ matrix.image }}

DockerfileCN

@@ -1,8 +1,11 @@
 # 基础镜像
-FROM golang:1.20.7-bookworm
+FROM golang:1.25.5-trixie
 
 # 作者信息
-LABEL MAINTAINER="xiaoqidun@gmail.com"
+LABEL authors="xiaoqidun"
+
+# 使用中国软件源
+RUN sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources
 
 # 安装编译工具链
 RUN apt-get update \
@@ -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-r29 /usr/local/android-ndk-r29
 
 # 环境变量
-ENV PATH=$PATH:/usr/local/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/bin
+ENV PATH=$PATH:/usr/local/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.cn,direct

DockerfileHK

@@ -1,8 +1,8 @@
 # 基础镜像
-FROM golang:1.20.7-bookworm
+FROM golang:1.25.5-trixie
 
 # 作者信息
-LABEL MAINTAINER="xiaoqidun@gmail.com"
+LABEL authors="xiaoqidun"
 
 # 安装编译工具链
 RUN apt-get update \
@@ -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-r29 /usr/local/android-ndk-r29
 
 # 环境变量
-ENV PATH=$PATH:/usr/local/android-ndk-r25c/toolchains/llvm/prebuilt/linux-x86_64/bin
+ENV PATH=$PATH:/usr/local/android-ndk-r29/toolchains/llvm/prebuilt/linux-x86_64/bin
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.aite.xyz,direct

README.md

@@ -5,12 +5,12 @@ golang environment
 
 ## 拉取镜像
 ```
-docker pull hkccr.ccs.tencentyun.com/xiaoqidun/goenv:latest
+docker pull ccr.ccs.tencentyun.com/xiaoqidun/goenv:latest
 ```
 
 ## 运行镜像
 ```
-docker run -it --rm hkccr.ccs.tencentyun.com/xiaoqidun/goenv
+docker run -it --rm ccr.ccs.tencentyun.com/xiaoqidun/goenv
 ```
 
 # 编译项目
@@ -19,17 +19,17 @@ docker run -it --rm hkccr.ccs.tencentyun.com/xiaoqidun/goenv
 
 ### linux - bash
 ```shell
-docker run --rm -it -v $(pwd):/go/src/app -w /go/src/app hkccr.ccs.tencentyun.com/xiaoqidun/goenv
+docker run --rm -it -v $(pwd):/usr/src/app -w /usr/src/app ccr.ccs.tencentyun.com/xiaoqidun/goenv
 ```
 
 ### windows - cmd
 ```bat
-docker run --rm -it -v %cd%:/go/src/app -w /go/src/app hkccr.ccs.tencentyun.com/xiaoqidun/goenv
+docker run --rm -it -v %cd%:/usr/src/app -w /usr/src/app ccr.ccs.tencentyun.com/xiaoqidun/goenv
 ```
 
 ### windows - powershell
 ```powershell
-docker run --rm -it -v "${pwd}:/go/src/app" -w /go/src/app hkccr.ccs.tencentyun.com/xiaoqidun/goenv
+docker run --rm -it -v "${pwd}:/usr/src/app" -w /usr/src/app ccr.ccs.tencentyun.com/xiaoqidun/goenv
 ```
 
 ## 在容器内执行命令进行编译