From 584bd23718b74d90f6020786fddec8fd5b114d1d Mon Sep 17 00:00:00 2001 From: Marek Date: Thu, 15 Feb 2024 00:02:06 +0100 Subject: [PATCH] Update Debian from Bullseye to Bookworm (#8273) --- book/src/user/supported-platforms.md | 4 ++-- book/src/user/troubleshooting.md | 2 +- docker/Dockerfile | 4 ++-- docker/zcash-lightwalletd/Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/book/src/user/supported-platforms.md b/book/src/user/supported-platforms.md index d42246d09..cbb83cdc8 100644 --- a/book/src/user/supported-platforms.md +++ b/book/src/user/supported-platforms.md @@ -17,7 +17,7 @@ For the full requirements, see [Tier 1 platform policy](platform-tier-policy.md# | platform | os | notes | rust | artifacts | -------|-------|-------|-------|------- -| `x86_64-unknown-linux-gnu` | [Debian 11](https://www.debian.org/releases/bullseye/) | 64-bit | [latest stable release](https://github.com/rust-lang/rust/releases) | Docker +| `x86_64-unknown-linux-gnu` | [Debian 11](https://www.debian.org/releases/bookworm/) | 64-bit | [latest stable release](https://github.com/rust-lang/rust/releases) | Docker ## Tier 2 @@ -46,5 +46,5 @@ For the full requirements, see [Tier 3 platform policy](platform-tier-policy.md# | platform | os | notes | rust | artifacts | -------|-------|-------|-------|------- -| `aarch64-unknown-linux-gnu` | [Debian 11](https://www.debian.org/releases/bullseye/) | 64-bit | [latest stable release](https://github.com/rust-lang/rust/releases) | N/A +| `aarch64-unknown-linux-gnu` | [Debian 11](https://www.debian.org/releases/bookworm/) | 64-bit | [latest stable release](https://github.com/rust-lang/rust/releases) | N/A | `aarch64-apple-darwin` | latest macOS | 64-bit, Apple M1 or M2 | [latest stable release](https://github.com/rust-lang/rust/releases) | N/A diff --git a/book/src/user/troubleshooting.md b/book/src/user/troubleshooting.md index f29a04460..8a92125fa 100644 --- a/book/src/user/troubleshooting.md +++ b/book/src/user/troubleshooting.md @@ -7,7 +7,7 @@ for: - macOS, - Ubuntu, - Docker: - - Debian Bullseye. + - Debian Bookworm. ## Memory Issues diff --git a/docker/Dockerfile b/docker/Dockerfile index 570642a79..c46da1235 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,7 +20,7 @@ ARG TEST_FEATURES="lightwalletd-grpc-tests zebra-checkpoints" ARG EXPERIMENTAL_FEATURES="" # This stage implements cargo-chef for docker layer caching -FROM rust:bullseye as chef +FROM rust:bookworm as chef RUN cargo install cargo-chef --locked WORKDIR /opt/zebrad @@ -181,7 +181,7 @@ RUN chmod u+x /entrypoint.sh # # To save space, this step starts from scratch using debian, and only adds the resulting # binary from the `release` stage -FROM debian:bullseye-slim AS runtime +FROM debian:bookworm-slim AS runtime COPY --from=release /opt/zebrad/target/release/zebrad /usr/local/bin COPY --from=release /entrypoint.sh / diff --git a/docker/zcash-lightwalletd/Dockerfile b/docker/zcash-lightwalletd/Dockerfile index 06ddcbfbd..7b9d08194 100644 --- a/docker/zcash-lightwalletd/Dockerfile +++ b/docker/zcash-lightwalletd/Dockerfile @@ -42,7 +42,7 @@ CMD ["--no-tls-very-insecure", "--grpc-bind-addr=0.0.0.0:9067", "--http-bind-ad ## ## Deploy ## -FROM debian:bullseye-slim as runtime +FROM debian:bookworm-slim as runtime ARG ZCASHD_CONF_PATH # Maintain backward compatibility with mainstream repo using this ARGs in docker-compose