Bookworm migration for mgmt-framework container

sonic-net · May 16, 2024 · d9fb39b · d9fb39b
1 parent 98fefc6
commit d9fb39b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/dockers/docker-sonic-mgmt-framework/Dockerfile.j2 b/dockers/docker-sonic-mgmt-framework/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 
@@ -10,9 +10,9 @@ RUN apt-get update && \
 
 # Limited to grpcio 1.58.0 due to armhf 
 RUN pip3 install connexion==2.7.0 \
-                 setuptools==21.0.0 \
+                 --upgrade setuptools \
                  grpcio==1.58.0 \
-                 grpcio-tools==1.20.0 \
+                 grpcio-tools==1.58.0 \
                  certifi==2017.4.17 \
                  python-dateutil==2.6.0 \
                  six==1.11.0 \

diff --git a/rules/docker-sonic-mgmt-framework.mk b/rules/docker-sonic-mgmt-framework.mk
@@ -8,16 +8,16 @@ $(DOCKER_MGMT_FRAMEWORK)_PATH = $(DOCKERS_PATH)/$(DOCKER_MGMT_FRAMEWORK_STEM)
 
 $(DOCKER_MGMT_FRAMEWORK)_DEPENDS += $(SONIC_MGMT_COMMON)
 $(DOCKER_MGMT_FRAMEWORK)_DEPENDS += $(SONIC_MGMT_FRAMEWORK)
-$(DOCKER_MGMT_FRAMEWORK)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_MGMT_FRAMEWORK)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
 $(DOCKER_MGMT_FRAMEWORK)_DBG_DEPENDS += $(SONIC_MGMT_FRAMEWORK_DBG)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_MGMT_FRAMEWORK)
-$(DOCKER_MGMT_FRAMEWORK)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_MGMT_FRAMEWORK)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
 
 $(DOCKER_MGMT_FRAMEWORK)_VERSION = 1.0.0
 $(DOCKER_MGMT_FRAMEWORK)_PACKAGE_NAME = mgmt-framework
 
-$(DOCKER_MGMT_FRAMEWORK)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_MGMT_FRAMEWORK)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
 
 ifeq ($(INCLUDE_MGMT_FRAMEWORK), y)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_MGMT_FRAMEWORK)
@@ -38,5 +38,5 @@ $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += --mount type=bind,source="/var/platform/",ta
 
 $(DOCKER_MGMT_FRAMEWORK)_BASE_IMAGE_FILES += sonic-cli:/usr/bin/sonic-cli
 
-SONIC_BUSTER_DOCKERS += $(DOCKER_MGMT_FRAMEWORK)
-SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_MGMT_FRAMEWORK_DBG)
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_MGMT_FRAMEWORK)
+SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MGMT_FRAMEWORK_DBG)