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

31 lines
1.8 KiB
Makefile
Raw Permalink 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) #### Why I did it Fix sonic-db-cli high CPU usage on SONiC startup issue: https://github.com/Azure/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/Azure/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-05-31 19:05:53 -05:00
$(PYTHON3_SWSSCOMMON) \
Streaming structured events implementation (#11848) With this PR in, you flap BGP and use events_tool to see the published events. With telemetry PR #111 in and corresponding submodule update done in buildimage, one could run gnmi_cli to capture BGP flap events.
2022-09-03 09:33:25 -05:00
$(SONIC_DB_CLI) \
$(SONIC_EVENTD)
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 += $(SONIC_PY_COMMON_PY3) \
[containercfgd] Add containercfgd and syslog rate limit configuration support (#12489) * [containercfgd] Add containercfgd and syslog rate limit configuration support * Fix build issue * Fix checker issue * Fix review comment * Fix review comment * Update containercfgd.py
2022-12-08 10:58:35 -06:00
$(SONIC_YANG_MGMT_PY3) \
$(SONIC_YANG_MODELS_PY3) \
$(SONIC_CONTAINERCFGD)
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 += $(SONIC_CONFIG_ENGINE_PY3)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_LOAD_DOCKERS += $(DOCKER_BASE_BULLSEYE)
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(SWSS_VARS_TEMPLATE)
Streaming structured events implementation (#11848) With this PR in, you flap BGP and use events_tool to see the published events. With telemetry PR #111 in and corresponding submodule update done in buildimage, one could run gnmi_cli to capture BGP flap events.
2022-09-03 09:33:25 -05:00
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(RSYSLOG_PLUGIN_CONF_J2)
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)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
Add health check probe for k8s upgrade containers. (#15223) #### Why I did it After k8s upgrade a container, k8s can only know the container is running, don't know the service's status inside container. So we need a probe inside container, k8s will call the probe to check whether the container is really ready. ##### Work item tracking - Microsoft ADO **(number only)**: 22453004 #### How I did it Add a health check probe inside config engine container, the probe will check whether the start service exit normally or not if the start service exists and call the python script to do container self-related specific checks if the script is there. The python script should be implemented by feature owner if it's needed. more details: [design doc](https://github.com/sonic-net/SONiC/blob/master/doc/kubernetes/health-check.md) #### How to verify it Check path /usr/bin/readiness_probe.sh inside container. #### Which release branch to backport (provide reason below if selected) - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [x] 202205 - [x] 202211 #### Tested branch (Please provide the tested image version) - [x] 20220531.28
2023-07-11 00:16:29 -05:00
$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_HEALTH_PROBE)
Move k8s script to docker-config-engine (#14788) 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-05 16:44:48 -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) \
Don't build libhiredis anymore (#15633) ### Why I did it We're not adding any patch on top of hiredis, and there's no apparent reason to build this. Remove the build step here, and just install the package from the Debian repos. ##### Work item tracking - Microsoft ADO **(number only)**: 24381590 #### How to verify it Build the SONiC image, and load it. Verify that services come up.
2023-09-06 18:23:34 -05:00
$(LIBSWSSCOMMON_DBG)
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_IMAGE_PACKAGES = $($(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES)
SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
Mark many (but not all) of the dockers as Bullseye dockers This tells the build infra that they need to be built as part of Bullseye and not Bookworm. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2023-09-07 19:06:59 -05:00
SONIC_BULLSEYE_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
Reference in New Issue Copy Permalink