Skip to content

Commit e46be54

Browse files
authored
Update the docker daemon to 24.0.2 (#15652)
Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent 39cb254 commit e46be54

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build_debian.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ set -x -e
3131
CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
3232

3333
## docker engine version (with platform)
34-
DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
35-
CONTAINERD_IO_VERSION=1.5.11-1
34+
DOCKER_VERSION=5:24.0.2-1~debian.11~$IMAGE_DISTRO
35+
CONTAINERD_IO_VERSION=1.6.21-1
3636
LINUX_KERNEL_VERSION=5.10.0-18-2
3737

3838
## Working directory to prepare the file system

sonic-slave-bullseye/Dockerfile.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ ENV PATH /usr/share/depot_tools:$PATH
580580
RUN pip3 install parameterized==0.8.1
581581
RUN pip3 install pyfakefs
582582

583-
# Install docker engine 20.10 inside docker and enable experimental feature
583+
# Install docker engine 24 inside docker and enable experimental feature
584584
RUN apt-get update
585585
RUN apt-get install -y \
586586
apt-transport-https \
@@ -601,7 +601,7 @@ RUN add-apt-repository \
601601
$(lsb_release -cs) \
602602
stable"
603603
RUN apt-get update
604-
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
604+
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
605605
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
606606
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
607607

sonic-slave-buster/Dockerfile.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ ENV PATH /usr/share/depot_tools:$PATH
596596
RUN pip3 install parameterized==0.8.1
597597
RUN pip3 install pyfakefs
598598
599-
# Install docker engine 17.03.2~ce-0 inside docker and enable experimental feature
599+
# Install docker engine 24 inside docker and enable experimental feature
600600
RUN apt-get update
601601
RUN apt-get install -y \
602602
apt-transport-https \
@@ -617,7 +617,7 @@ RUN add-apt-repository \
617617
$(lsb_release -cs) \
618618
stable"
619619
RUN apt-get update
620-
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
620+
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
621621
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
622622
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
623623

0 commit comments

Comments
 (0)