From dda4a50e75ef75e71d0840d3fc7ec2367c5956d5 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Wed, 27 Aug 2025 11:15:00 +0900 Subject: [PATCH] update dockerfile for rustc 1.89 --- docker/Dockerfile | 1 - docker/Dockerfile-slim | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8d9ff29..7c5e9ce 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,7 +40,6 @@ RUN apt-get update && apt-get install -qy --no-install-recommends $BUILD_DEPS ${ echo "Install toolchain" && \ rustup target add $(cat /arch)-${TARGET_SUFFIX} && \ echo "Building rpxy from source" && \ - cargo update &&\ cargo build --release --target=$(cat /arch)-${TARGET_SUFFIX} ${CARGO_FEATURES} && \ strip --strip-all /tmp/target/$(cat /arch)-${TARGET_SUFFIX}/release/rpxy &&\ cp /tmp/target/$(cat /arch)-${TARGET_SUFFIX}/release/rpxy /tmp/target/release/rpxy diff --git a/docker/Dockerfile-slim b/docker/Dockerfile-slim index b0ef5b1..b8305e7 100644 --- a/docker/Dockerfile-slim +++ b/docker/Dockerfile-slim @@ -25,7 +25,11 @@ COPY . /tmp/ ENV RUSTFLAGS="-C link-arg=-s" RUN echo "Building rpxy from source" && \ - cargo update && \ + # force to reinstall rustup to get the latest version + curl https://sh.rustup.rs -sqSf | sh -s -- -y --profile minimal --default-toolchain stable --default-host $(uname -m)-unknown-linux-gnu && \ + rustup target add $(cat /arch)-unknown-linux-musl || rustup component add --toolchain stable rust-src && \ + rustup component add --toolchain stable rustfmt clippy && \ + # build rpxy cargo build --release --target $(cat /arch)-unknown-linux-musl ${CARGO_FEATURES} && \ musl-strip --strip-all /tmp/target/$(cat /arch)-unknown-linux-musl/release/rpxy && \ cp /tmp/target/$(cat /arch)-unknown-linux-musl/release/rpxy /tmp/target/release/rpxy