From 735fd1b67467a12b360f765020e35b8dea5349fe Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Wed, 31 Dec 2025 18:06:13 +0800
Subject: [PATCH] fixed shadowsocks image

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

diff --git a/.gitea/workflows/build-shadowsocks-rust.yaml b/.gitea/workflows/build-shadowsocks-rust.yaml
index 190ecc8..9925a26 100644
--- a/.gitea/workflows/build-shadowsocks-rust.yaml
+++ b/.gitea/workflows/build-shadowsocks-rust.yaml
@@ -17,26 +17,13 @@ jobs:
           username: woggioni
           password: ${{ secrets.PUBLISHER_TOKEN }}
       -
-        name: Build and push sserver-rust images amd64
-        uses: docker/build-push-action@v6
-        with:
-          context: "{{defaultContext}}:shadowsocks-rust"
-          platforms: |
-            linux/amd64
-          push: true
-          pull: false
-          ssh: default=/home/luser/.ssh/id_ed25519
-          tags: |
-            "gitea.woggioni.net/woggioni/sserver-rust:latest"
-            "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
-          build-args: "VERSION=1.24.0"
-      -
-        name: Build and push sserver-rust images aarch64
+        name: Build and push sserver-rust images
         uses: docker/build-push-action@v6
         with:
           builder: multiplatform-builder
           context: "{{defaultContext}}:shadowsocks-rust"
           platforms: |
+            linux/amd64
             linux/arm64
           push: true
           pull: false
diff --git a/shadowsocks-rust/Dockerfile b/shadowsocks-rust/Dockerfile
index 800340b..8539285 100644
--- a/shadowsocks-rust/Dockerfile
+++ b/shadowsocks-rust/Dockerfile
@@ -1,10 +1,9 @@
 FROM --platform=$BUILDPLATFORM gitea.woggioni.net/woggioni/arch-builder:rust-full AS base
 
 ARG VERSION TARGETPLATFORM BUILDPLATFORM
-
 WORKDIR /home/luser/shadowsocks-rust
-
-ADD --chown=luser:luser git@github.com:shadowsocks/shadowsocks-rust.git#v${VERSION} .
+#ADD --chown=luser:luser git@github.com:shadowsocks/shadowsocks-rust.git#v${VERSION} .
+RUN git clone --depth 1 --branch "v${VERSION}" https://github.com/shadowsocks/shadowsocks-rust.git .
 
 FROM base AS builder-linux_386
 ENV RUST_TARGET="i686-unknown-linux-musl"
@@ -24,7 +23,7 @@ ENV RUST_TARGET="arm-unknown-linux-musleabihf"
 ENV CC_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-gcc
 ENV CXX_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-g++
 
-FROM builder-${TARGETPLATFORM/\//_} AS builder
+FROM builder-${TARGETPLATFORM//\//_} AS builder
 RUN rustup target add $RUST_TARGET
 RUN cargo +stable build --locked --target "$RUST_TARGET" --release --features "full,aead-cipher-extra,aead-cipher-2022-extra,security-replay-attack-detect" \
     && mv target/$RUST_TARGET/release/ss* target/release/