Skip to content

Commit 22a41d0

Browse files
committed
fix: Docker build upgrade to alpine 3.20
- Removed armv7, arm-linux-gnueabihf, windows-gnu in default build
1 parent d586741 commit 22a41d0

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/build-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
matrix:
2424
target:
2525
- i686-unknown-linux-musl
26-
- x86_64-pc-windows-gnu
26+
# - x86_64-pc-windows-gnu
2727
- x86_64-unknown-linux-gnu
2828
- x86_64-unknown-linux-musl
29-
- armv7-unknown-linux-musleabihf
30-
- armv7-unknown-linux-gnueabihf
29+
# - armv7-unknown-linux-musleabihf
30+
# - armv7-unknown-linux-gnueabihf
3131
- arm-unknown-linux-gnueabi
32-
- arm-unknown-linux-gnueabihf
32+
# - arm-unknown-linux-gnueabihf
3333
- arm-unknown-linux-musleabi
3434
- arm-unknown-linux-musleabihf
3535
- aarch64-unknown-linux-gnu

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM --platform=$BUILDPLATFORM rust:1.67.1-alpine3.17 AS builder
1+
FROM --platform=$BUILDPLATFORM rust:alpine3.20 AS builder
22

33
ARG TARGETARCH
44

55
RUN set -x \
6-
&& apk add --no-cache build-base cmake
6+
&& apk add --no-cache build-base cmake llvm15-dev clang15-libclang clang15 rust-bindgen
77

88
WORKDIR /root/shadowsocks-rust
99

@@ -33,11 +33,10 @@ RUN case "$TARGETARCH" in \
3333
&& echo "CC=$CC" \
3434
&& rustup override set stable \
3535
&& rustup target add "$RUST_TARGET" \
36-
&& cargo install --force --locked bindgen-cli \
3736
&& RUSTFLAGS="-C linker=$CC" CC=$CC cargo build --target "$RUST_TARGET" --release --features "full" \
3837
&& mv target/$RUST_TARGET/release/ss* target/release/
3938

40-
FROM alpine:3.17 AS sslocal
39+
FROM alpine:3.20 AS sslocal
4140

4241
# NOTE: Please be careful to change the path of these binaries, refer to #1149 for more information.
4342
COPY --from=builder /root/shadowsocks-rust/target/release/sslocal /usr/bin/

0 commit comments

Comments
 (0)