From 85778c96b10c4b647118363ffdd798f9f78f9345 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Mon, 22 Dec 2025 09:19:08 +0800
Subject: [PATCH] updated shadowsocks build

---
 .gitea/workflows/build-shadowsocks-rust.yaml | 23 +++++++++++++++-----
 shadowsocks-rust/Dockerfile                  |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/build-shadowsocks-rust.yaml b/.gitea/workflows/build-shadowsocks-rust.yaml
index 3ca76e3..143cbc6 100644
--- a/.gitea/workflows/build-shadowsocks-rust.yaml
+++ b/.gitea/workflows/build-shadowsocks-rust.yaml
@@ -11,12 +11,11 @@ jobs:
     steps:
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3
         with:
           driver: docker-container
           platforms: |
             linux/amd64
-            linux/arm64
       -
         name: Login to Gitea container registry
         uses: docker/login-action@v3
@@ -25,15 +24,14 @@ jobs:
           username: woggioni
           password: ${{ secrets.PUBLISHER_TOKEN }}
       -
-        name: Build and push sserver-rust images
+        name: Build and push sserver-rust images amd64
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}:shadowsocks-rust"
           platforms: |
             linux/amd64
-            linux/arm64
           push: true
-          pull: true
+          pull: false
           tags: |
             "gitea.woggioni.net/woggioni/sserver-rust:latest"
             "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
@@ -41,3 +39,18 @@ jobs:
           cache-from: type=registry,ref=gitea.woggioni.net/woggioni/sserver-rust:buildx
           cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/sserver-rust:buildx          
 
+      -
+        name: Build and push sserver-rust images aarch64
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:shadowsocks-rust"
+          platforms: |
+            linux/arm64
+          push: true
+          pull: false
+          tags: |
+            "gitea.woggioni.net/woggioni/sserver-rust:latest"
+            "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
+          build-args: "VERSION=1.24.0"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/sserver-rust:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/sserver-rust:buildx          
diff --git a/shadowsocks-rust/Dockerfile b/shadowsocks-rust/Dockerfile
index 5b57762..14e5909 100644
--- a/shadowsocks-rust/Dockerfile
+++ b/shadowsocks-rust/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION TARGETPLATFORM BUILDPLATFORM
 
 WORKDIR /home/luser/shadowsocks-rust
 
-RUN git clone --depth 1 --branch "v${VERSION}" https://github.com/shadowsocks/shadowsocks-rust.git .
+ADD --chown=luser:luser https://github.com/shadowsocks/shadowsocks-rust.git#v${VERSION} .
 
 FROM base AS builder-linux_386
 ENV RUST_TARGET="i686-unknown-linux-musl"