matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
0cc9fdc69b
sonic-buildimage/rules/docker-orchagent.mk

42 lines
1.7 KiB
Makefile
Raw Normal View History

[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
# docker image for orchagent
DOCKER_ORCHAGENT_STEM = docker-orchagent
DOCKER_ORCHAGENT = $(DOCKER_ORCHAGENT_STEM).gz
DOCKER_ORCHAGENT_DBG = $(DOCKER_ORCHAGENT_STEM)-$(DBG_IMAGE_MARK).gz
[redis] Install vanilla redis packages for Buster and Stretch; upgrade Buster to 6.0.5 (#4732) upgrade redis server to 5:6.0.5-1~bpo10+1
2020-06-27 03:17:20 -05:00
$(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS)
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
[swss]: Convert swss docker to bullseye (#10484) * [swss]: Convert swss docker to bullseye Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
2022-05-17 15:55:59 -05:00
$(DOCKER_ORCHAGENT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS)
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
$(DOCKER_ORCHAGENT)_DBG_DEPENDS += $(SWSS_DBG) \
$(LIBSWSSCOMMON_DBG) \
$(LIBSAIREDIS_DBG)
[scapy] update scapy to 2.4.5 and patch it (#10457) Why I did it Running warm-reboot in a loop for 500 times leads to this error on 318-th iteration: Apr 2 15:56:27.346747 sonic INFO swss#/supervisord: restore_neighbors Traceback (most recent call last): Apr 2 15:56:27.346747 sonic INFO swss#/supervisord: restore_neighbors File "/usr/bin/restore_neighbors.py", line 24, in <module> Apr 2 15:56:27.346747 sonic INFO swss#/supervisord: restore_neighbors from scapy.all import conf, in6_getnsma, inet_pton, inet_ntop, in6_getnsmac, get_if_hwaddr, Ether, ARP, IPv6, ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr Apr 2 15:56:27.346795 sonic INFO swss#/supervisord: restore_neighbors File "/usr/local/lib/python3.7/dist-packages/scapy/all.py", line 25, in <module> Apr 2 15:56:27.346956 sonic INFO swss#/supervisord: restore_neighbors from scapy.route import * Apr 2 15:56:27.346995 sonic INFO swss#/supervisord: restore_neighbors File "/usr/local/lib/python3.7/dist-packages/scapy/route.py", line 205, in <module> Apr 2 15:56:27.347089 sonic INFO swss#/supervisord: restore_neighbors conf.iface = get_working_if() Apr 2 15:56:27.347129 sonic INFO swss#/supervisord: restore_neighbors File "/usr/local/lib/python3.7/dist-packages/scapy/arch/linux.py", line 128, in get_working_if Apr 2 15:56:27.347213 sonic INFO swss#/supervisord: restore_neighbors ifflags = struct.unpack("16xH14x", get_if(i, SIOCGIFFLAGS))[0] Apr 2 15:56:27.347250 sonic INFO swss#/supervisord: restore_neighbors File "/usr/local/lib/python3.7/dist-packages/scapy/arch/common.py", line 31, in get_if Apr 2 15:56:27.347345 sonic INFO swss#/supervisord: restore_neighbors return ioctl(sck, cmd, struct.pack("16s16x", iff.encode("utf8"))) Apr 2 15:56:27.347365 sonic INFO swss#/supervisord: restore_neighbors OSError: [Errno 19] No such device The issue was reported to scapy devs secdev/scapy#3369, the fix is secdev/scapy#3371, however there is no released scapy version with this fix right now, thus decided to build scapy v2.4.5 from sources and apply the fix in a form of a patch. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
2022-04-07 06:23:35 -05:00
$(DOCKER_ORCHAGENT)_PYTHON_WHEELS += $(SCAPY)
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
[swss]: Convert swss docker to bullseye (#10484) * [swss]: Convert swss docker to bullseye Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
2022-05-17 15:55:59 -05:00
$(DOCKER_ORCHAGENT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_IMAGE_PACKAGES)
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
$(DOCKER_ORCHAGENT)_PATH = $(DOCKERS_PATH)/$(DOCKER_ORCHAGENT_STEM)
[swss]: Convert swss docker to bullseye (#10484) * [swss]: Convert swss docker to bullseye Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
2022-05-17 15:55:59 -05:00
$(DOCKER_ORCHAGENT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
[dockers] label SONiC Docker with manifest (#5939) Signed-off-by: Stepan Blyschak stepanb@nvidia.com This PR is part of SONiC Application Extension Depends on #5938 - Why I did it To provide an infrastructure change in order to support SONiC Application Extension feature. - How I did it Label every installable SONiC Docker with a minimal required manifest and auto-generate packages.json file based on installed SONiC images. - How to verify it Build an image, execute the following command: admin@sonic:~$ docker inspect docker-snmp:1.0.0 | jq '.[0].Config.Labels["com.azure.sonic.manifest"]' -r | jq Cat /var/lib/sonic-package-manager/packages.json file to verify all dockers are listed there.
2021-04-26 15:51:50 -05:00
$(DOCKER_ORCHAGENT)_VERSION = 1.0.0
$(DOCKER_ORCHAGENT)_PACKAGE_NAME = swss
[SONiC Application Extension] support warm/fast reboot for extension packages (#7286) #### Why I did it I made this change to support warm/fast reboot for SONiC extension packages as per HLD Azure/SONiC#682. #### How I did it I extended manifest.json.j2 with new warm/fast reboot related fields and also extended sonic_debian_extension.j2 script template to generate the shutdown order files for warm and fast reboot.
2021-07-11 08:58:05 -05:00
$(DOCKER_ORCHAGENT)_WARM_SHUTDOWN_BEFORE = syncd
$(DOCKER_ORCHAGENT)_FAST_SHUTDOWN_BEFORE = syncd
[dockers] label SONiC Docker with manifest (#5939) Signed-off-by: Stepan Blyschak stepanb@nvidia.com This PR is part of SONiC Application Extension Depends on #5938 - Why I did it To provide an infrastructure change in order to support SONiC Application Extension feature. - How I did it Label every installable SONiC Docker with a minimal required manifest and auto-generate packages.json file based on installed SONiC images. - How to verify it Build an image, execute the following command: admin@sonic:~$ docker inspect docker-snmp:1.0.0 | jq '.[0].Config.Labels["com.azure.sonic.manifest"]' -r | jq Cat /var/lib/sonic-package-manager/packages.json file to verify all dockers are listed there.
2021-04-26 15:51:50 -05:00
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
SONIC_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_ORCHAGENT)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG)
$(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss
[baseimage]: support building multi-asic component (#3856) - move single instance services into their own folder - generate Systemd templates for any multi-instance service files in slave.mk - detect single or multi-instance platform in systemd-sonic-generator based on asic.conf platform specific file. - update container hostname after creation instead of during creation (docker_image_ctl) - run Docker containers in a network namespace if specified - add a service to create a simulated multi-ASIC topology on the virtual switch platform Signed-off-by: Lawrence Lee <t-lale@microsoft.com> Signed-off-by: Suvarna Meenakshi <Suvarna.Meenaksh@microsoft.com>
2020-01-26 15:56:42 -06:00
$(DOCKER_ORCHAGENT)_RUN_OPT += --privileged -t
[build]: Makefile: Extend to build debug docker images for all stretch dockers (#2789) Overall goal: Build debug images for every stretch docker. An earlier PR (#2789) made the first cut, by transforming broadcom/orchagent to build target/docker-orhagent-dbg.gz. Changes in this PR: Made docker-orchagent build to be platform independent. 1.1) Created rules/docker_orchagent.mk 1.2) Removed platform//docker-orchagent-*.mk 1.3) Removed the corresponding entry from platform//rules.mk Extended the debug docker image build to stretch based syncd dockers. 2.1) For now, only mellanox & barefoot are stretch based. 2.2) All the common variable definitions are put in one place platform/template/docker-syncd-base.mk 2.3) platform/[mellanox, bfn]/docker-syncd-[mlnx, bfn].mk are updated as detailed below. 2.3.1) Set platform code and include template base file 2.3.2) Add the dependencies & debug dependencies and any update over what base template offers. Extended all stretch based non-platform dockers to build debug dockers too. 3.1) Affected are: docker-database.mk, docker-platform-monitor.mk, docker-router-advertiser.mk, docker-teamd.mk, docker-telemetry.mk Next: Build debug flavor of final images with regular dockers replaced with debug dockers where available.
2019-04-19 20:49:21 -05:00
$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro
$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro
$(DOCKER_ORCHAGENT)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro
$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw
Added missing swssloglevel utility. (#2821) Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
2019-04-25 02:34:34 -05:00
$(DOCKER_ORCHAGENT)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
[swss] Enhance ARP Update to Call Sonic Cfggen Once (#5398) This PR limited the number of calls to sonic-cfggen to one call per iteration instead of current 3 calls per iteration. The PR also installs jq on host for future scripts if needed. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-18 20:44:23 -05:00
$(DOCKER_ORCHAGENT)_FILES += $(ARP_UPDATE_SCRIPT) $(ARP_UPDATE_VARS_TEMPLATE) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
Reference in New Issue Copy Permalink