Skip to content

Commit b8cd435

Browse files
[build] Upgrade docker-sonic-vs from bullseye to bookworm.
1 parent b73d613 commit b8cd435

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
NOJESSIE ?= 1
44
NOSTRETCH ?= 1
5-
NOBUSTER ?= 0
6-
NOBULLSEYE ?= 0
5+
NOBUSTER ?= 1
6+
NOBULLSEYE ?= 1
77
NOBOOKWORM ?= 0
88

99
override Q := @

platform/vs/docker-sonic-vs.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
4646
$(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
4747
$(COPP_CONFIG_TEMPLATE)
4848

49-
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
49+
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
5050
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)
5151

52-
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_VS)
52+
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SONIC_VS)

platform/vs/docker-sonic-vs/Dockerfile.j2

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
2+
FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55

@@ -18,7 +18,7 @@ RUN apt-get install -y net-tools \
1818
tcpdump \
1919
ifupdown \
2020
bridge-utils \
21-
python-ply \
21+
python3-ply \
2222
libqt5core5a \
2323
libqt5network5 \
2424
libgmp10 \
@@ -69,8 +69,6 @@ RUN apt-get install -y net-tools \
6969
libgssrpc4 \
7070
libkdb5-10
7171

72-
RUN apt-get install -y -t bullseye-backports iproute2
73-
7472
# For sonic-config-engine Python 3 package
7573
# Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed.
7674
# Then immediately uninstall enum34, as enum34 should not be installed for Python >= 3.4, as it causes a

0 commit comments

Comments
 (0)