From e2ce4661867c75ba64682d6fc1d32f61c4beee34 Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Fri, 3 May 2024 11:03:44 +0200 Subject: [PATCH] CI: upgrade to Rust 1.77.2 and Debian bookworm (#34) --- .github/workflows/rust.yml | 13 ++++--------- Dockerfile | 4 ++-- hook-worker/src/dns.rs | 0 3 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 hook-worker/src/dns.rs diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a525f3b..4c3a3d5 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,9 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Install rust - uses: dtolnay/rust-toolchain@master - with: - toolchain: stable + uses: dtolnay/rust-toolchain@1.77 - uses: actions/cache@v3 with: @@ -52,9 +50,7 @@ jobs: echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts - name: Install rust - uses: dtolnay/rust-toolchain@master - with: - toolchain: stable + uses: dtolnay/rust-toolchain@1.77 - uses: actions/cache@v3 with: @@ -73,10 +69,9 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install latest rust - uses: dtolnay/rust-toolchain@master + - name: Install rust + uses: dtolnay/rust-toolchain@1.77 with: - toolchain: stable components: clippy,rustfmt - uses: actions/cache@v3 diff --git a/Dockerfile b/Dockerfile index 67aea7f..a6c59b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/lukemathwalker/cargo-chef:latest-rust-1.74.0-buster AS chef +FROM docker.io/lukemathwalker/cargo-chef:latest-rust-1.77-bookworm AS chef ARG BIN WORKDIR /app @@ -20,7 +20,7 @@ RUN cargo chef cook --release --recipe-path recipe.json COPY . . RUN cargo build --release --bin $BIN -FROM debian:bullseye-20230320-slim AS runtime +FROM debian:bookworm-slim AS runtime RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/hook-worker/src/dns.rs b/hook-worker/src/dns.rs new file mode 100644 index 0000000..e69de29