Skip to content

Commit 852bf8e

Browse files
sg893052KAVITHA RAMALINGAM
sg893052
authored and
KAVITHA RAMALINGAM
committed
Upgrade broadcom platform containers(syncd) to Bookworm (sonic-net#19712)
1 parent 4c0e072 commit 852bf8e

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

‎platform/broadcom/docker-saiserver-brcm.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ $(SYNCD_INIT_COMMON_SCRIPT)_PATH = $(SRC_PATH)/sonic-sairedis/syncd/scripts
1010
SONIC_COPY_FILES += $(SYNCD_INIT_COMMON_SCRIPT)
1111

1212
$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD) $(SYNCD_INIT_COMMON_SCRIPT)
13-
$(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
13+
$(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
1414
SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM)
15-
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SAISERVER_BRCM)
15+
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SAISERVER_BRCM)
1616

1717
#Support two versions of saiserver
1818
$(DOCKER_SAISERVER_BRCM)_CONTAINER_NAME = saiserver$(SAITHRIFT_VER)

‎platform/broadcom/docker-saiserver-brcm/Dockerfile.j2

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

44
ARG docker_container_name
55

‎platform/broadcom/docker-syncd-brcm-dnx-rpc.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ $(DOCKER_SYNCD_BRCM_DNX_RPC)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
3030
$(DOCKER_SYNCD_BRCM_DNX_RPC)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
3131
$(DOCKER_SYNCD_BRCM_DNX_RPC)_MACHINE = broadcom-dnx
3232

33-
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_BRCM_DNX_RPC)
33+
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SYNCD_BRCM_DNX_RPC)

‎platform/broadcom/docker-syncd-brcm-dnx.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ DOCKER_SYNCD_DNX_PLATFORM_CODE = brcm-dnx
77
$(DOCKER_SYNCD_DNX_BASE)_PATH = $(PLATFORM_PATH)/docker-syncd-$(DOCKER_SYNCD_DNX_PLATFORM_CODE)
88
$(DOCKER_SYNCD_DNX_BASE)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
99

10-
$(DOCKER_SYNCD_DNX_BASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
11-
$(DOCKER_SYNCD_DNX_BASE)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
12-
$(DOCKER_SYNCD_DNX_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
10+
$(DOCKER_SYNCD_DNX_BASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
11+
$(DOCKER_SYNCD_DNX_BASE)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
12+
$(DOCKER_SYNCD_DNX_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
1313

1414
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_DNX_BASE)
1515
ifneq ($(ENABLE_SYNCD_RPC),y)
@@ -47,5 +47,5 @@ $(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
4747
$(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
4848
$(DOCKER_SYNCD_DNX_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common
4949

50-
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_DNX_BASE)
51-
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SYNCD_DNX_BASE_DBG)
50+
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SYNCD_DNX_BASE)
51+
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_SYNCD_DNX_BASE_DBG)

‎platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2

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

44
ARG docker_container_name
55

‎platform/broadcom/docker-syncd-brcm-rpc.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ $(DOCKER_SYNCD_BRCM_RPC)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
2929
$(DOCKER_SYNCD_BRCM_RPC)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
3030
$(DOCKER_SYNCD_BRCM_RPC)_MACHINE = broadcom
3131

32-
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SYNCD_BRCM_RPC)
32+
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SYNCD_BRCM_RPC)

‎platform/broadcom/docker-syncd-brcm.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# docker image for brcm syncd
22

33
DOCKER_SYNCD_PLATFORM_CODE = brcm
4-
include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk
4+
include $(PLATFORM_PATH)/../template/docker-syncd-bookworm.mk
55

66
$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
77
$(DOCKER_SYNCD_BASE)_DEPENDS += $(BRCM_XGS_SAI)

‎platform/broadcom/docker-syncd-brcm/Dockerfile.j2

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

44
ARG docker_container_name
55

0 commit comments

Comments
 (0)