fixed shadowsocks image
All checks were successful
CI / Build shadowsocks-rust docker images (push) Successful in 2m45s

This commit is contained in:
2025-12-31 18:06:13 +08:00
parent 7c1725427b
commit 735fd1b674
2 changed files with 5 additions and 19 deletions

View File

@@ -17,26 +17,13 @@ jobs:
username: woggioni username: woggioni
password: ${{ secrets.PUBLISHER_TOKEN }} password: ${{ secrets.PUBLISHER_TOKEN }}
- -
name: Build and push sserver-rust images amd64 name: Build and push sserver-rust images
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
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder builder: multiplatform-builder
context: "{{defaultContext}}:shadowsocks-rust" context: "{{defaultContext}}:shadowsocks-rust"
platforms: | platforms: |
linux/amd64
linux/arm64 linux/arm64
push: true push: true
pull: false pull: false

View File

@@ -1,10 +1,9 @@
FROM --platform=$BUILDPLATFORM gitea.woggioni.net/woggioni/arch-builder:rust-full AS base FROM --platform=$BUILDPLATFORM gitea.woggioni.net/woggioni/arch-builder:rust-full AS base
ARG VERSION TARGETPLATFORM BUILDPLATFORM ARG VERSION TARGETPLATFORM BUILDPLATFORM
WORKDIR /home/luser/shadowsocks-rust 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 FROM base AS builder-linux_386
ENV RUST_TARGET="i686-unknown-linux-musl" 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 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++ 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 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" \ 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/ && mv target/$RUST_TARGET/release/ss* target/release/