Skip to content

Commit 23d3821

Browse files
wumiaontsaksarav-nokia
authored andcommitted
Make macsec container to build with bookworm (sonic-net#18148)
Why I did it We Nokia took the task to make macsec container to work with bookworm. This PR requires another PR for sonic-wpa-supplicant(sonic-net/sonic-wpa-supplicant#80) to be in first. Otherwise sonic build will fail for bookworm wpasupplicant debian package. How I did it How to verify it After build and boot up system with new image, macsec container should run with bookworm. Corresponding mgmt macsec suite will work here. Which release branch to backport (provide reason below if selected) Tested branch (Please provide the tested image version) Tested with latest master of sonic-buildimage. Built vs image and loaded into vs testing environment. Code pass with macsec test suites. Description for the changelog Make macsec container to build with bookworm
1 parent 8e4f9e0 commit 23d3821

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

dockers/docker-macsec/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, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
2+
FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
33

44
ARG docker_container_name
55

rules/docker-macsec.mk

+7-8
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,28 @@ DOCKER_MACSEC_DBG = $(DOCKER_MACSEC_STEM)-$(DBG_IMAGE_MARK).gz
66

77
$(DOCKER_MACSEC)_PATH = $(DOCKERS_PATH)/$(DOCKER_MACSEC_STEM)
88

9-
$(DOCKER_MACSEC)_DEPENDS += $(SWSS) $(WPASUPPLICANT) $(LIBSWSSCOMMON) $(LIBNL3) $(LIBNL_GENL3) $(LIBNL_ROUTE3)
10-
$(DOCKER_MACSEC)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
11-
$(DOCKER_MACSEC)_DBG_DEPENDS += $(SWSS_DBG) $(WPASUPPLICANT_DBG) $(LIBSWSSCOMMON_DBG)
9+
$(DOCKER_MACSEC)_DEPENDS += $(WPASUPPLICANT)
10+
$(DOCKER_MACSEC)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_DEPENDS)
11+
$(DOCKER_MACSEC)_DBG_DEPENDS += $(WPASUPPLICANT_DBG)
1212

13-
$(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
13+
$(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_PACKAGES)
1414

15-
$(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
15+
$(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
1616

1717
$(DOCKER_MACSEC)_INSTALL_PYTHON_WHEELS = $(SONIC_UTILITIES_PY3)
1818
$(DOCKER_MACSEC)_INSTALL_DEBS = $(PYTHON3_SWSSCOMMON) $(LIBYANG_PY3)
1919

2020
SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC)
21-
SONIC_BULLSEYE_DOCKERS += $(DOCKER_MACSEC)
21+
SONIC_BOOKWORM_DOCKERS += $(DOCKER_MACSEC)
2222
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_MACSEC_DBG)
23-
SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_MACSEC_DBG)
23+
SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MACSEC_DBG)
2424

2525
ifeq ($(INCLUDE_KUBERNETES),y)
2626
$(DOCKER_MACSEC)_DEFAULT_FEATURE_OWNER = kube
2727
endif
2828

2929
$(DOCKER_MACSEC)_DEFAULT_FEATURE_STATE_ENABLED = y
3030

31-
3231
ifeq ($(INCLUDE_MACSEC),y)
3332
ifeq ($(INSTALL_DEBUG_TOOLS),y)
3433
SONIC_PACKAGES_LOCAL += $(DOCKER_MACSEC_DBG)

0 commit comments

Comments
 (0)