matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9cd3319495
sonic-buildimage/rules/docker-config-engine-bullseye.mk

28 lines
1.5 KiB
Makefile
Raw Normal View History

Create docker-base-bullseye and docker-config-engine-bullseye (#9666) * [slave-bullseye]: Remove Python 2 It shouldn't be needed anymore. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * [dockers]: Add docker-base-bullseye and docker-config-engine-bullseye Also upgrade socat from 1.7.3.1 to 1.7.4.1 Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2022-01-11 11:23:42 -06:00
# docker image for sonic config engine
DOCKER_CONFIG_ENGINE_BULLSEYE = docker-config-engine-bullseye.gz
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_PATH = $(DOCKERS_PATH)/docker-config-engine-bullseye
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \
$(LIBYANG) \
$(LIBYANG_CPP) \
$(LIBYANG_PY3) \
[swsscommon] Add c++ version sonic-db-cli from sonic-swss-common (#10825) (#11713) Cherry pick PR https://github.com/sonic-net/sonic-buildimage/pull/10825 to 202205 branch #### Why I did it Fix sonic-db-cli high CPU usage on SONiC startup issue: https://github.com/sonic-net/sonic-buildimage/issues/10218 ETA of this issue will be 2022/05/31 #### How I did it Re-write sonic-cli with c++ in sonic-swss-common: https://github.com/sonic-net/sonic-swss-common/pull/607 Modify swss-common rules and slave.mk to install c++ version sonic-db-cli. #### How to verify it Pass all E2E test scenario. #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 #### Description for the changelog Build and install c++ version sonic-db-cli from swss-common. #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/SONiC/wiki/Configuration. --> #### A picture of a cute animal (not mandatory but encouraged)
2022-08-17 02:35:00 -05:00
$(PYTHON3_SWSSCOMMON) \
$(SONIC_DB_CLI)
Create docker-base-bullseye and docker-config-engine-bullseye (#9666) * [slave-bullseye]: Remove Python 2 It shouldn't be needed anymore. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * [dockers]: Add docker-base-bullseye and docker-config-engine-bullseye Also upgrade socat from 1.7.3.1 to 1.7.4.1 Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2022-01-11 11:23:42 -06:00
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SWSSSDK_PY3)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \
$(SONIC_YANG_MGMT_PY3) \
$(SONIC_YANG_MODELS_PY3)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_LOAD_DOCKERS += $(DOCKER_BASE_BULLSEYE)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(SWSS_VARS_TEMPLATE)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
Move k8s script to docker-config-engine (#14788) (#15740) Why I did it To reduce the container's dependency from host system Work item tracking Microsoft ADO (number only): 17713469 How I did it Move the k8s container startup script to config engine container, other than mount it from host. How to verify it Check file path(/usr/share/sonic/scripts/container_startup.py) inside config engine container. Signed-off-by: Yun Li <yunli1@microsoft.com> Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>
2023-07-07 11:22:58 -05:00
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_STARTUP_SCRIPT)
Create docker-base-bullseye and docker-config-engine-bullseye (#9666) * [slave-bullseye]: Remove Python 2 It shouldn't be needed anymore. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * [dockers]: Add docker-base-bullseye and docker-config-engine-bullseye Also upgrade socat from 1.7.3.1 to 1.7.4.1 Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2022-01-11 11:23:42 -06:00
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_BASE_BULLSEYE)_DBG_DEPENDS) \
$(LIBSWSSCOMMON_DBG) \
$(LIBHIREDIS_DBG)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES)
SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
Reference in New Issue Copy Permalink