From ca0e85d36729a69cc07c670a42cd33131c33e297 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Wed, 20 Jul 2022 01:23:50 +0800 Subject: [PATCH] put CC inline --- Cargo.lock | 2 +- Dockerfile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 830bbeff..2a8eea78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2058,7 +2058,7 @@ dependencies = [ [[package]] name = "shadowsocks-rust" -version = "1.15.0-alpha.7" +version = "1.15.0-alpha.8" dependencies = [ "build-time", "byte_string", diff --git a/Dockerfile b/Dockerfile index 77b07bca..189f1a0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,11 +30,10 @@ RUN case "$TARGETARCH" in \ && wget -qO- "https://musl.cc/$MUSL-cross.tgz" | tar -xzC /root/ \ && PATH="/root/$MUSL-cross/bin:$PATH" \ && CC=/root/$MUSL-cross/bin/$MUSL-gcc \ + && echo "CC=$CC" \ && rustup override set nightly \ - && rustup target add $RUST_TARGET \ - && RUSTFLAGS="-C linker=$CC" \ - && CC=$CC \ - && cargo build --target "$RUST_TARGET" --release --features "local-tun local-redir armv8 neon stream-cipher aead-cipher-2022" \ + && rustup target add "$RUST_TARGET" \ + && RUSTFLAGS="-C linker=$CC" CC=$CC cargo build --target "$RUST_TARGET" --release --features "local-tun local-redir armv8 neon stream-cipher aead-cipher-2022" \ && mv target/$RUST_TARGET/release/ss* target/release/ FROM alpine:3.16 AS sslocal