From a28c92b2dc9cf119ae0b32187eebe780246fccf8 Mon Sep 17 00:00:00 2001 From: Matthias Endler Date: Thu, 7 Nov 2024 16:46:02 +0100 Subject: [PATCH] Update all Docker images to Debian Bookworm (#1558) --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 6 +++--- Dockerfile-CI.Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 65d3c0650b..6644909cfd 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.236.0/containers/rust/.devcontainer/base.Dockerfile -# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye -ARG VARIANT="buster" +# [Choice] Debian OS version (use bookworm on local arm64/Apple Silicon): buster, bullseye, bookworm +ARG VARIANT="bookworm" FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT} \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b838ff2b5a..04ec7357ef 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,9 +5,9 @@ "build": { "dockerfile": "Dockerfile", "args": { - // Use the VARIANT arg to pick a Debian OS version: buster, bullseye - // Use bullseye when on local on arm64/Apple Silicon. - "VARIANT": "bullseye" + // Use the VARIANT arg to pick a Debian OS version: buster, bullseye, bookworm + // Use bookworm when on local on arm64/Apple Silicon. + "VARIANT": "bookworm" } }, "runArgs": [ diff --git a/Dockerfile-CI.Dockerfile b/Dockerfile-CI.Dockerfile index e97bc9e38d..5d857672f5 100644 --- a/Dockerfile-CI.Dockerfile +++ b/Dockerfile-CI.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim AS builder +FROM debian:bookworm-slim AS builder WORKDIR /builder RUN apt-get update \ @@ -17,7 +17,7 @@ RUN apt-get update \ esac \ && chmod +x lychee -FROM debian:bullseye-slim +FROM debian:bookworm-slim RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \