优化编译脚本

.github/workflows/release.yml

@@ -65,12 +65,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          cache-from: type=gha,scope=anylink
+          #cache-from: type=gha,scope=anylink
-          cache-to: type=gha,mode=max,scope=anylink
+          #cache-to: type=gha,mode=max,scope=anylink
           context: .
           file: ./docker/Dockerfile
-          #platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          platforms: linux/amd64
+          #platforms: linux/amd64
           build-args: |
             appVer=${{ env.APP_VER }}
             commitId=${{ env.commitId }}

build_docker.sh

@@ -8,6 +8,9 @@ echo $ver
 # 生成时间 2024-01-30T21:41:27+08:00
 # date -Iseconds
 
+docker run -it --rm -v $PWD/web:/app -w /app node:16-alpine \
+  sh -c "yarn install --registry=https://registry.npmmirror.com && yarn run build"
+
 docker buildx build -t bjdgyc/anylink:latest --progress=plain --build-arg CN="yes" --build-arg appVer=$ver \
   --build-arg commitId=$(git rev-parse HEAD) -f docker/Dockerfile .
 

docker/Dockerfile

@@ -1,7 +1,13 @@
 #node:16-bullseye
 #golang:1.20-bullseye
 #debian:bullseye-slim
-#sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+#bullseye
+# sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+#bookworm
+# sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources
+
+# sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+
 
 # 配合 github action 使用
 # 需要先编译出ui文件后 再执行docker编译

docker/init_build.sh

@@ -20,7 +20,9 @@ go mod tidy
 
 echo "start build"
 
-ldflags="-s -w -extldflags '-static' -X main.appVer=$appVer -X main.commitId=$commitId -X main.buildDate=$(date -Iseconds)"
+extldflags="-static"
+ldflags="-s -w -X main.appVer=$appVer -X main.commitId=$commitId -X main.buildDate=$(date -Iseconds) \
+  -extldflags \"$extldflags\" "
 
 go build -o anylink -trimpath -ldflags "$ldflags"
 

release.sh

@@ -21,13 +21,14 @@ rm -rf artifact-dist
 mkdir artifact-dist
 
 function archive() {
-  os=$1
+  arch=$1
-  arch=$2
+  #echo "整理部署文件 $arch"
-  #echo "整理部署文件 $os $arch"
+  arch_name=${arch//\//-}
+  echo $arch_name
 
-  deploy="anylink-$ver-$os-$arch"
+  deploy="anylink-$ver-$arch_name"
   docker container rm $deploy
-  docker container create --platform $os/$arch --name $deploy bjdgyc/anylink:$ver
+  docker container create --platform $arch --name $deploy bjdgyc/anylink:$ver
   rm -rf anylink-deploy
   docker cp -a $deploy:/app ./anylink-deploy
 
@@ -39,8 +40,9 @@ function archive() {
 
 echo "copy二进制文件"
 
-archive linux amd64
+archive "linux/amd64"
-#archive linux arm64
+archive "linux/arm64"
+archive "linux/arm/v7"
 
 ls -lh artifact-dist
 

yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+