From e46be54f140b9d1324d09d8442ba9bcd72308bc8 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 6 Jul 2023 14:44:29 -0700 Subject: [PATCH] Update the docker daemon to 24.0.2 (#15652) Signed-off-by: Saikrishna Arcot --- build_debian.sh | 4 ++-- sonic-slave-bullseye/Dockerfile.j2 | 4 ++-- sonic-slave-buster/Dockerfile.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build_debian.sh b/build_debian.sh index e4df940db732..7b215772e77d 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -31,8 +31,8 @@ set -x -e CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64) ## docker engine version (with platform) -DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO -CONTAINERD_IO_VERSION=1.5.11-1 +DOCKER_VERSION=5:24.0.2-1~debian.11~$IMAGE_DISTRO +CONTAINERD_IO_VERSION=1.6.21-1 LINUX_KERNEL_VERSION=5.10.0-18-2 ## Working directory to prepare the file system diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2 index a8b40cb6b38c..401d3651164b 100644 --- a/sonic-slave-bullseye/Dockerfile.j2 +++ b/sonic-slave-bullseye/Dockerfile.j2 @@ -580,7 +580,7 @@ ENV PATH /usr/share/depot_tools:$PATH RUN pip3 install parameterized==0.8.1 RUN pip3 install pyfakefs -# Install docker engine 20.10 inside docker and enable experimental feature +# Install docker engine 24 inside docker and enable experimental feature RUN apt-get update RUN apt-get install -y \ apt-transport-https \ @@ -601,7 +601,7 @@ RUN add-apt-repository \ $(lsb_release -cs) \ stable" RUN apt-get update -RUN apt-get install -y docker-ce=5:20.10.14~3-0~debian-bullseye docker-ce-cli=5:20.10.14~3-0~debian-bullseye containerd.io=1.5.11-1 +RUN apt-get install -y docker-ce=5:24.0.2-1~debian.11~bullseye docker-ce-cli=5:24.0.2-1~debian.11~bullseye containerd.io=1.6.21-1 docker-buildx-plugin=0.10.5-1~debian.11~bullseye docker-compose-plugin=2.18.1-1~debian.11~bullseye RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker RUN update-alternatives --set iptables /usr/sbin/iptables-legacy diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 8c292e2105a0..7e0bf6d06bcf 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -596,7 +596,7 @@ ENV PATH /usr/share/depot_tools:$PATH RUN pip3 install parameterized==0.8.1 RUN pip3 install pyfakefs -# Install docker engine 17.03.2~ce-0 inside docker and enable experimental feature +# Install docker engine 24 inside docker and enable experimental feature RUN apt-get update RUN apt-get install -y \ apt-transport-https \ @@ -617,7 +617,7 @@ RUN add-apt-repository \ $(lsb_release -cs) \ stable" RUN apt-get update -RUN apt-get install -y docker-ce=5:20.10.21~3-0~debian-buster docker-ce-cli=5:20.10.21~3-0~debian-buster +RUN apt-get install -y docker-ce=5:24.0.2-1~debian.10~buster docker-ce-cli=5:24.0.2-1~debian.10~buster containerd.io=1.6.21-1 docker-buildx-plugin=0.10.5-1~debian.10~buster docker-compose-plugin=2.18.1-1~debian.10~buster RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker RUN update-alternatives --set iptables /usr/sbin/iptables-legacy