From 0210920eb64cefadcc1937f6e200df6211165589 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 2 Dec 2024 21:27:25 +0000 Subject: [PATCH 1/2] fix(dogfood): downgrade containerd.io to work around containerd DinD issue --- dogfood/contents/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/contents/Dockerfile b/dogfood/contents/Dockerfile index 21a3825427c2d..a2567b082217e 100644 --- a/dogfood/contents/Dockerfile +++ b/dogfood/contents/Dockerfile @@ -128,7 +128,7 @@ RUN apt-get update --quiet && apt-get install --yes \ ca-certificates \ cargo \ cmake \ - containerd.io \ + containerd.io=1.7.23-1 \ crypto-policies \ curl \ docker-ce \ From d106c6174d425e69aab2e593139f7b4eebaa9818 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 2 Dec 2024 21:47:15 +0000 Subject: [PATCH 2/2] pin --- dogfood/contents/Dockerfile | 2 +- dogfood/contents/files/etc/apt/preferences.d/containerd | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 dogfood/contents/files/etc/apt/preferences.d/containerd diff --git a/dogfood/contents/Dockerfile b/dogfood/contents/Dockerfile index a2567b082217e..21a3825427c2d 100644 --- a/dogfood/contents/Dockerfile +++ b/dogfood/contents/Dockerfile @@ -128,7 +128,7 @@ RUN apt-get update --quiet && apt-get install --yes \ ca-certificates \ cargo \ cmake \ - containerd.io=1.7.23-1 \ + containerd.io \ crypto-policies \ curl \ docker-ce \ diff --git a/dogfood/contents/files/etc/apt/preferences.d/containerd b/dogfood/contents/files/etc/apt/preferences.d/containerd new file mode 100644 index 0000000000000..ab0b8f9891aa2 --- /dev/null +++ b/dogfood/contents/files/etc/apt/preferences.d/containerd @@ -0,0 +1,6 @@ +# Ref: https://github.com/nestybox/sysbox/issues/879 +# We need to pin containerd to a specific version to avoid breaking +# Docker-in-Docker. +Package: containerd.io +Pin: version 1.7.23-1 +Pin-Priority: 1001