From f71ccfa1ccd2801572e6c34908e29cd12cf4e1bd Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Thu, 26 Oct 2023 16:21:26 +0200 Subject: [PATCH] changelog: move Docker 24 btrfs driver notice to "changes". Signed-off-by: Thilo Fromm --- changelog/changes/2023-10-25-docker-gentoo-upstream.md | 5 ++++- changelog/updates/2023-10-25-docker-24-critools-1.27.md | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog/changes/2023-10-25-docker-gentoo-upstream.md b/changelog/changes/2023-10-25-docker-gentoo-upstream.md index 2bc7b28e41..397407dfbb 100644 --- a/changelog/changes/2023-10-25-docker-gentoo-upstream.md +++ b/changelog/changes/2023-10-25-docker-gentoo-upstream.md @@ -1 +1,4 @@ -- cri-tools, runc, containerd, docker, and docker-cli are now shipped without debugging symbols and built from Gentoo upstream ebuilds. +- cri-tools, runc, containerd, docker, and docker-cli are now shipped without debugging symbols and built from Gentoo upstream ebuilds. Docker was updated to Docker 24 (see "updates"). + - **NOTE** The docker btrfs storage driver has been de-prioritised; BTRFS backed storage will now default to the `overlay2` driver + ([changelog](https://docs.docker.com/engine/release-notes/23.0/#bug-fixes-and-enhancements-6), [upstream pr](https://github.com/moby/moby/pull/42661)). + Using the btrfs driver can still be enforced by creating a respective [docker config](https://docs.docker.com/storage/storagedriver/btrfs-driver/#configure-docker-to-use-the-btrfs-storage-driver) at `/etc/docker/daemon.json`. diff --git a/changelog/updates/2023-10-25-docker-24-critools-1.27.md b/changelog/updates/2023-10-25-docker-24-critools-1.27.md index f2b9692f68..9db5a411d6 100644 --- a/changelog/updates/2023-10-25-docker-24-critools-1.27.md +++ b/changelog/updates/2023-10-25-docker-24-critools-1.27.md @@ -1,5 +1,2 @@ - docker ([24.0.6](https://docs.docker.com/engine/release-notes/24.0/), includes changes from [23.0](https://docs.docker.com/engine/release-notes/23.0/)) - - **NOTE** The docker btrfs storage driver has been de-prioritised; BTRFS backed storage will now default to the `overlay2` driver - ([changelog](https://docs.docker.com/engine/release-notes/23.0/#bug-fixes-and-enhancements-6), [upstream pr](https://github.com/moby/moby/pull/42661)). - Using the btrfs driver can still be enforced by creating a respective [docker config](https://docs.docker.com/storage/storagedriver/btrfs-driver/#configure-docker-to-use-the-btrfs-storage-driver) at `/etc/docker/daemon.json`. - cri-tools ([1.27.0](https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.27.0))