matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add Bookworm swss-layer (#18062)

Browse Source 
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2024-02-09 15:56:26 -08:00 committed by GitHub
parent bd47fd1559
commit 34bdfc8b39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dockers/docker-swss-layer-bookworm/Dockerfile.j2 Normal file
View File

@ -0,0 +1,24 @@
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
RUN apt-get install iputils-ping
{% if docker_swss_layer_bookworm_debs.strip() -%}
# Copy locally-built Debian package dependencies
{{ copy_files("debs/", docker_swss_layer_bookworm_debs.split(' '), "/debs/") }}
# Install locally-built Debian packages and implicitly install their dependencies
{{ install_debian_packages(docker_swss_layer_bookworm_debs.split(' ')) }}
{%- endif %}
RUN apt-get clean -y && \
apt-get autoclean -y && \
apt-get autoremove -y && \
rm -rf /debs
ENTRYPOINT ["/usr/local/bin/supervisord"]

9
rules/docker-swss-layer-bookworm.dep Normal file
View File

@ -0,0 +1,9 @@
DPATH := $($(DOCKER_SWSS_LAYER_BOOKWORM)_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/docker-swss-layer-bookworm.mk rules/docker-swss-layer-bookworm.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
DEP_FILES += $(shell git ls-files $(DPATH))
$(DOCKER_SWSS_LAYER_BOOKWORM)_CACHE_MODE := GIT_CONTENT_SHA
$(DOCKER_SWSS_LAYER_BOOKWORM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(DOCKER_SWSS_LAYER_BOOKWORM)_DEP_FILES := $(DEP_FILES)

14
rules/docker-swss-layer-bookworm.mk Normal file
View File

@ -0,0 +1,14 @@
# bookworm-based docker image for sonic swss layer
DOCKER_SWSS_LAYER_BOOKWORM= docker-swss-layer-bookworm.gz
$(DOCKER_SWSS_LAYER_BOOKWORM)_PATH = $(DOCKERS_PATH)/docker-swss-layer-bookworm
$(DOCKER_SWSS_LAYER_BOOKWORM)_DEPENDS += $(SWSS)
$(DOCKER_SWSS_LAYER_BOOKWORM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
$(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS) \
$(SWSS_DBG)
$(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
SONIC_DOCKER_IMAGES += $(DOCKER_SWSS_LAYER_BOOKWORM)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)