From 23182d0435b08037f55638e1677b9a2de54289de Mon Sep 17 00:00:00 2001 From: vndroid Date: Wed, 8 Mar 2023 12:46:53 +0800 Subject: [PATCH] Update docker base image - Update base image to alpine 3.17 --- Dockerfile | 6 +++--- README.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b798198a..6c7f4328 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM rust:1.61.0-alpine AS builder +FROM --platform=$BUILDPLATFORM rust:1.67.1-alpine3.17 AS builder ARG TARGETARCH @@ -36,7 +36,7 @@ RUN case "$TARGETARCH" in \ && RUSTFLAGS="-C linker=$CC" CC=$CC cargo build --target "$RUST_TARGET" --release --features "local-tun local-redir stream-cipher aead-cipher-2022" \ && mv target/$RUST_TARGET/release/ss* target/release/ -FROM alpine:3.16 AS sslocal +FROM alpine:3.17 AS sslocal COPY --from=builder /root/shadowsocks-rust/target/release/sslocal /usr/local/bin/ COPY --from=builder /root/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/ @@ -45,7 +45,7 @@ COPY --from=builder /root/shadowsocks-rust/docker/docker-entrypoint.sh /usr/loca ENTRYPOINT [ "docker-entrypoint.sh" ] CMD [ "sslocal", "--log-without-time", "-c", "/etc/shadowsocks-rust/config.json" ] -FROM alpine:3.16 AS ssserver +FROM alpine:3.17 AS ssserver COPY --from=builder /root/shadowsocks-rust/target/release/ssserver /usr/local/bin/ COPY --from=builder /root/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/ diff --git a/README.md b/README.md index 5e2ae88f..ff5ce0fd 100644 --- a/README.md +++ b/README.md @@ -115,8 +115,8 @@ docker pull ghcr.io/shadowsocks/ssserver-rust:latest If you want to build the Docker image yourself, you need to use the [BuildX](https://docs.docker.com/buildx/working-with-buildx/). ```bash -docker buildx build -t shadowsocks/ssserver-rust:latest -t shadowsocks/ssserver-rust:v1.11.1 --target ssserver . -docker buildx build -t shadowsocks/sslocal-rust:latest -t shadowsocks/sslocal-rust:v1.11.1 --target sslocal . +docker buildx build -t shadowsocks/ssserver-rust:latest -t shadowsocks/ssserver-rust:v1.15.2 --target ssserver . +docker buildx build -t shadowsocks/sslocal-rust:latest -t shadowsocks/sslocal-rust:v1.15.2 --target sslocal . ``` #### Run the container