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

.drone.yml

@@ -1,59 +0,0 @@
----
-kind: pipeline
-type: docker
-name: goenv
-
-steps:
-  - name: build
-    pull: if-not-exists
-    image: golang:alpine
-    commands:
-      - chmod +x build.sh
-      - ./build.sh
-  - name: upload
-    image: xiaoqidun/gocos
-    settings:
-      secret_id:
-        from_secret: cos_secret_id
-      secret_key:
-        from_secret: cos_secret_key
-      bucket_url:
-        from_secret: cos_bucket_url
-      source: release/
-      target: product/goenv
-      strip_prefix: release/
-
----
-kind: pipeline
-type: docker
-name: docker
-
-steps:
-  - name: build
-    pull: if-not-exists
-    image: alpine
-    commands:
-      - wget -q -T 180 https://dl.google.com/android/repository/android-ndk-r23-linux.zip
-      - unzip -q android-ndk-r23-linux.zip
-      - rm -f android-ndk-r23-linux.zip
-  - name: docker1
-    pull: if-not-exists
-    image: plugins/docker
-    settings:
-      repo: xiaoqidun/goenv
-      username:
-        from_secret: docker_username1
-      password:
-        from_secret: docker_password1
-      dockerfile: Dockerfile
-  - name: docker2
-    pull: if-not-exists
-    image: plugins/docker
-    settings:
-      repo: hkccr.ccs.tencentyun.com/xiaoqidun/goenv
-      registry: hkccr.ccs.tencentyun.com
-      username:
-        from_secret: docker_username2
-      password:
-        from_secret: docker_password2
-      dockerfile: Dockerfile

.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

@@ -0,0 +1,22 @@
+# 基础镜像
+FROM golang:1.25.5-trixie
+
+# 作者信息
+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 \
+    && apt-get install -y \
+    build-essential mingw-w64 \
+    && rm -rf /var/lib/apt/lists/*
+
+# 安装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 GO111MODULE=on
+ENV GOPROXY=https://goproxy.cn,direct

DockerfileHK

@@ -1,19 +1,19 @@
 # 基础镜像
-FROM golang:1.17-bullseye
+FROM golang:1.25.5-trixie
 
 # 作者信息
-LABEL MAINTAINER="xiaoqidun@gmail.com"
+LABEL authors="xiaoqidun"
 
 # 安装编译工具链
 RUN apt-get update \
     && apt-get install -y \
     build-essential mingw-w64 \
-    upx-ucl strace htop tmux file zip
+    && rm -rf /var/lib/apt/lists/*
 
 # 安装android ndk
-COPY android-ndk-r23 /usr/local/android-ndk-r23
+COPY android-ndk-r29 /usr/local/android-ndk-r29
 
 # 环境变量
-ENV PATH=$PATH:/usr/local/android-ndk-r23/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
 ```
 
 ## 在容器内执行命令进行编译
@@ -73,17 +73,3 @@ go build -o main_windows_amd64.exe main.go
 
 ## 动态编译
 - 动态编译必须设置CC变量，指定C编译器可执行文件路径或者在PATH变量内的可执行C编译器名称
-
-# 快捷命令 - goenv
-> 运行一个goenv容器并将当前目录挂载到容器的工作目录
-
-## 快速安装
-```shell
-go install github.com/xiaoqidun/goenv@latest
-```
-
-## 手动安装
-1. 根据系统架构下载为你编译好的[二进制文件](https://aite.xyz/product/goenv/)
-2. 将下载好的二进制文件重命名为goenv并保留后缀
-3. 把goenv文件移动到系统PATH环境变量中的目录下
-4. windows外的系统需使用chmod命令赋予可执行权限

build.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o release/goenv_linux_amd64 -trimpath -ldflags '-s -w' goenv.go
-GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -o release/goenv_darwin_amd64 -trimpath -ldflags '-s -w' goenv.go
-GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -o release/goenv_windows_amd64.exe -trimpath -ldflags '-s -w' goenv.go

go.mod

@@ -1,3 +0,0 @@
-module github.com/xiaoqidun/goenv
-
-go 1.15

goenv.go

@@ -1,77 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"os/exec"
-	"runtime"
-)
-
-var (
-	author bool
-)
-
-func init() {
-	flag.BoolVar(&author, "author", false, "关于本软件开发者")
-	flag.Parse()
-}
-
-func main() {
-	if author {
-		Author()
-		return
-	}
-	binary := "docker"
-	if runtime.GOOS == "linux" {
-		podman, err := exec.LookPath("podman")
-		if err == nil {
-			binary = podman
-		}
-	}
-	docker := &DockerGoEnv{
-		Image:        "hkccr.ccs.tencentyun.com/xiaoqidun/goenv",
-		Binary:       binary,
-		WorkDir:      "/go/src/app",
-		AutoDelete:   true,
-		MountWorkDir: true,
-	}
-	docker.Run()
-}
-
-func Author() {
-	fmt.Println("welcome to our website https://aite.xyz/")
-	fmt.Println("----------------------------------------")
-	fmt.Println("腾讯扣扣：88966001")
-	fmt.Println("电子邮箱：xiaoqidun@gmail.com")
-}
-
-type DockerGoEnv struct {
-	Image        string
-	Binary       string
-	CmdArgs      []string
-	WorkDir      string
-	AutoDelete   bool
-	MountWorkDir bool
-}
-
-func (d *DockerGoEnv) Run() {
-	d.CmdArgs = []string{"run", "-it"}
-	if d.AutoDelete {
-		d.CmdArgs = append(d.CmdArgs, "--rm")
-	}
-	if d.MountWorkDir {
-		if pwd, err1 := os.Getwd(); err1 == nil {
-			d.CmdArgs = append(d.CmdArgs, "-v", pwd+":"+d.WorkDir, "-w", d.WorkDir)
-		}
-	}
-	if hostname, err1 := os.Hostname(); err1 == nil {
-		d.CmdArgs = append(d.CmdArgs, "-h", hostname)
-	}
-	d.CmdArgs = append(d.CmdArgs, d.Image)
-	cmd := exec.Command(d.Binary, d.CmdArgs...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	_ = cmd.Run()
-}