diff --git a/shadowsocks-rust/Dockerfile b/shadowsocks-rust/Dockerfile index 24b0fe1..8539285 100644 --- a/shadowsocks-rust/Dockerfile +++ b/shadowsocks-rust/Dockerfile @@ -39,8 +39,8 @@ FROM busybox:musl AS sslocal COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/target/release/sslocal /usr/bin/ COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/ COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/ -COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin -COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin +COPY --from=builder --chown=root:root /tmp/v2ray-plugin /usr/bin/v2ray-plugin +COPY --from=builder --chown=root:root /tmp/xray-plugin /usr/bin/xray-plugin ENTRYPOINT [ "docker-entrypoint.sh" ] CMD [ "sslocal", "--log-without-time", "-c", "/etc/shadowsocks-rust/config.json" ] @@ -50,8 +50,8 @@ FROM busybox:musl AS ssserver COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/target/release/ssserver /usr/bin/ COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/ COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/ -COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin -COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin +COPY --from=builder /tmp/v2ray-plugin /usr/bin/v2ray-plugin +COPY --from=builder /tmp/xray-plugin /usr/bin/xray-plugin ENTRYPOINT [ "docker-entrypoint.sh" ] diff --git a/shadowsocks-rust/download_xray.sh b/shadowsocks-rust/download_xray.sh index a86fd30..30220ae 100755 --- a/shadowsocks-rust/download_xray.sh +++ b/shadowsocks-rust/download_xray.sh @@ -1,25 +1,25 @@ #!/usr/bin/env sh -set -e TARGETPLATFORM=$1 -PLUGIN_VERSION=1.260327.0 +PLUGIN_VERSION=1.8.24 mkdir /tmp/xray_plugin.d cd /tmp/xray_plugin.d case "$TARGETPLATFORM" in "linux/386") - url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-i386" + url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-386-linux/1.8.24/xray-plugin-linux-386-v1.8.24.tar.gz" ;; "linux/amd64") - url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-x86_64" + url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-amd64-linux/1.8.24/xray-plugin-linux-amd64-v1.8.24.tar.gz" ;; "linux/arm64") - url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-aarch64" + url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-arm64-linux/1.8.24/xray-plugin-linux-arm64-v1.8.24.tar.gz" ;; "linux/arm/v7") - url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-armv7h" + url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-arm-linux/1.8.24/xray-plugin-linux-arm-v1.8.24.tar.gz" ;; *) echo "Doesn't support $TARGETPLATFORM architecture" exit 1 ;; esac -curl --fail -L --retry 3 "$url" -o /tmp/xray-plugin +curl --retry 3 "$url" | tar -xvz +mv xray-plugin* /tmp/xray-plugin