From b8cd435351dbc231533d3cd4ba55f112824d236f Mon Sep 17 00:00:00 2001
From: shilongliu <shilongliu@microsoft.com>
Date: Sat, 14 Sep 2024 17:15:41 +0800
Subject: [PATCH] [build] Upgrade docker-sonic-vs from bullseye to bookworm.

---
 Makefile                                  | 4 ++--
 platform/vs/docker-sonic-vs.mk            | 4 ++--
 platform/vs/docker-sonic-vs/Dockerfile.j2 | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ca2192f66fea..c99c5b94c399 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 
 NOJESSIE ?= 1
 NOSTRETCH ?= 1
-NOBUSTER ?= 0
-NOBULLSEYE ?= 0
+NOBUSTER ?= 1
+NOBULLSEYE ?= 1
 NOBOOKWORM ?= 0
 
 override Q := @
diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk
index 53735eb980cf..3e66e94546ad 100644
--- a/platform/vs/docker-sonic-vs.mk
+++ b/platform/vs/docker-sonic-vs.mk
@@ -46,7 +46,7 @@ $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
                             $(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
                             $(COPP_CONFIG_TEMPLATE)
 
-$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
+$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
 SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)
 
-SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_VS)
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_SONIC_VS)
diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2
index 6caa69b301f9..9bb9c974617f 100644
--- a/platform/vs/docker-sonic-vs/Dockerfile.j2
+++ b/platform/vs/docker-sonic-vs/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 
@@ -18,7 +18,7 @@ RUN apt-get install -y net-tools \
                        tcpdump \
                        ifupdown \
                        bridge-utils \
-                       python-ply \
+                       python3-ply \
                        libqt5core5a \
                        libqt5network5 \
                        libgmp10 \
@@ -69,8 +69,6 @@ RUN apt-get install -y net-tools \
                        libgssrpc4 \
                        libkdb5-10
 
-RUN apt-get install -y -t bullseye-backports iproute2
-
 # For sonic-config-engine Python 3 package
 # Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed.
 # Then immediately uninstall enum34, as enum34 should not be installed for Python >= 3.4, as it causes a