matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the docker daemon to 24.0.2 (#15652)

Browse Source 
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2023-07-06 14:44:29 -07:00 committed by GitHub
parent 39cb2545e6
commit e46be54f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_debian.sh
View File

@ -31,8 +31,8 @@ set -x -e
CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64) CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
## docker engine version (with platform) ## docker engine version (with platform)
DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO DOCKER_VERSION=5:24.0.2-1~debian.11~$IMAGE_DISTRO
CONTAINERD_IO_VERSION=1.5.11-1 CONTAINERD_IO_VERSION=1.6.21-1
LINUX_KERNEL_VERSION=5.10.0-18-2 LINUX_KERNEL_VERSION=5.10.0-18-2
## Working directory to prepare the file system ## Working directory to prepare the file system

4
sonic-slave-bullseye/Dockerfile.j2
View File

@ -580,7 +580,7 @@ ENV PATH /usr/share/depot_tools:$PATH
RUN pip3 install parameterized==0.8.1 RUN pip3 install parameterized==0.8.1
RUN pip3 install pyfakefs 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 update
RUN apt-get install -y \ RUN apt-get install -y \
apt-transport-https \ apt-transport-https \
@ -601,7 +601,7 @@ RUN add-apt-repository \
$(lsb_release -cs) \ $(lsb_release -cs) \
stable" stable"
RUN apt-get update 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 echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy RUN update-alternatives --set iptables /usr/sbin/iptables-legacy

4
sonic-slave-buster/Dockerfile.j2
View File

@ -596,7 +596,7 @@ ENV PATH /usr/share/depot_tools:$PATH
RUN pip3 install parameterized==0.8.1 RUN pip3 install parameterized==0.8.1
RUN pip3 install pyfakefs 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 update
RUN apt-get install -y \ RUN apt-get install -y \
apt-transport-https \ apt-transport-https \
@ -617,7 +617,7 @@ RUN add-apt-repository \
$(lsb_release -cs) \ $(lsb_release -cs) \
stable" stable"
RUN apt-get update 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 echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy RUN update-alternatives --set iptables /usr/sbin/iptables-legacy