Skip to content

Commit fd0e469

Browse files
saiarcot895FengPan-Frank
authored andcommitted
Upgrade docker in Trixie slave container to Docker 28 (#25669)
* Upgrade docker in Trixie slave container to Docker 28 This was missed in the initial Trixie upgrade, but as of right now, this has no impact on anything. This upgrades the Docker daemon in the Trixie slave container to Docker 28. Docker 29 is the latest version, but due to changes in how containers are built and possible memory usage increases, I'm keeping it at 28 for now. Signed-off-by: Saikrishna Arcot <[email protected]> * Update Docker version in final image as well Signed-off-by: Saikrishna Arcot <[email protected]> * Fix containerd.io version Signed-off-by: Saikrishna Arcot <[email protected]> * Replace with variable Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]> Signed-off-by: Feng Pan <[email protected]>
1 parent 470a816 commit fd0e469

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

build_debian.sh

Lines changed: 2 additions & 2 deletions
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:28.2.2-1~debian.13~$IMAGE_DISTRO
35-
CONTAINERD_IO_VERSION=1.7.27-1
34+
DOCKER_VERSION=5:28.5.2-1~debian.13~$IMAGE_DISTRO
35+
CONTAINERD_IO_VERSION=1.7.28-2~debian.13~$IMAGE_DISTRO
3636
LINUX_KERNEL_VERSION=6.12.41+deb13
3737

3838
## Working directory to prepare the file system

sonic-slave-trixie/Dockerfile.j2

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ RUN cd /usr/src/gtest && cmake . && make -C /usr/src/gtest
637637
#RUN mkdir /var/run/sshd
638638
EXPOSE 22
639639

640-
# Install docker engine 24 inside docker and enable experimental feature
640+
# Install docker engine 28 inside docker and enable experimental feature
641641
RUN apt-get update
642642
RUN eatmydata apt-get install -y \
643643
apt-transport-https \
@@ -649,15 +649,12 @@ RUN eatmydata apt-get install -y \
649649
{%- endif %}
650650
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | tee /etc/apt/trusted.gpg.d/docker-stable.asc
651651
COPY docker.sources /etc/apt/sources.list.d/docker.sources
652-
# TODO(trixie) - Migrate to trixie docker packages
653-
#RUN echo "Suites: $(lsb_release -cs)" >> /etc/apt/sources.list.d/docker.sources
654-
# Install docker packages from bookworm
655-
RUN echo "Suites: bookworm" >> /etc/apt/sources.list.d/docker.sources
652+
RUN echo "Suites: $(lsb_release -cs)" >> /etc/apt/sources.list.d/docker.sources
656653
{%- if CROSS_BUILD_ENVIRON != "y" %}
657654
RUN echo "Architectures: {{ CONFIGURED_ARCH }}" >> /etc/apt/sources.list.d/docker.sources
658655
{%- endif %}
659656
RUN apt-get update
660-
RUN eatmydata apt-get install -y docker-ce=5:24.0.2-1~debian.12~bookworm docker-ce-cli=5:24.0.2-1~debian.12~bookworm containerd.io=1.6.21-1 docker-buildx-plugin=0.10.5-1~debian.12~bookworm docker-compose-plugin=2.18.1-1~debian.12~bookworm
657+
RUN eatmydata apt-get install -y docker-ce=5:28.5.2-1~debian.13~trixie docker-ce-cli=5:28.5.2-1~debian.13~trixie containerd.io=1.7.28-2~debian.13~trixie docker-buildx-plugin=0.26.1-1~debian.13~trixie docker-compose-plugin=2.39.1-1~debian.13~trixie
661658
RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs {{ DOCKER_EXTRA_OPTS }}\"" >> /etc/default/docker
662659
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy
663660

0 commit comments

Comments
 (0)