[docker-config-engine]: introduce docker sonic config engine by lguohan · Pull Request #274 · sonic-net/sonic-buildimage

lguohan · 2017-02-07T08:33:59Z

No description provided.

lguohan · 2017-02-07T08:35:36Z

one image size decreased by ~30%

-rw-r--r-- 1 lgh lgh 451227877 Feb  7 08:17 sonic-aboot-broadcom-1.swi
-rw-r--r-- 1 lgh lgh 615025670 Feb  7 02:58 sonic-aboot-broadcom.swi

qiluo-msft · 2017-02-07T16:26:51Z

dockers/docker-config-engine/Dockerfile.j2

looks like it is the same as before

You can also strip whitespace in templates by hand. If you add a minus sign (-) to the start or end of a block (e.g. a For tag), a comment, or a variable expression, the whitespaces before or after that block will be removed:

it is correct

qiluo-msft · 2017-02-07T16:27:12Z

dockers/docker-config-engine/Dockerfile.j2

extra '-'s? {% endfor %}. Also below.

qiluo-msft

Minor comments.

sonic config engine provide the sonic configure engine for all sonic dockers that rely on the engine to generate runtime configuration.

lguohan · 2017-02-07T18:05:37Z

rebase master

taoyl-ms · 2017-02-07T19:48:27Z

dockers/docker-dhcp-relay/Dockerfile.j2

-RUN apt-get -y install python-lxml python-jinja2 python-netaddr python-ipaddr python-yaml
-
-
-COPY \


I'll vote for keep those lines as removing them will cause confusion when later developers want to add dependency for this docker.
If we really want to remove those lines, maybe revert this docker from DOCKER_IMAGES back to SIMPLE_DOCKER_IMAGES in rule.mk?

Should rename from Dockerfile.j2 to Dockerfile as well? SIMPLE_DOCKER don't use dockerfile templates

taoyl-ms · 2017-02-07T19:49:11Z

dockers/docker-platform-monitor/Dockerfile.j2

-# Dependencies for sonic-cfggen                                                                                                                                                           
-RUN apt-get install -y python-lxml python-jinja2 python-netaddr python-ipaddr python-yaml 
-
-COPY \


Same with dhcp-relay. Revert to SIMPLE_DOCKER_IMAGES?

…type

taoyl-ms · 2017-02-07T22:02:43Z

…cker

sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (sonic-net#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (sonic-net#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (sonic-net#839) Set LAG mtu value based on kernel netlink msg (sonic-net#922) [orchagent]: Remove try/catch for correct coredump file (sonic-net#790) [aclorch] unittest by gtest (sonic-net#924) [orchagent]: Added support of PFC WD for BFN platform (sonic-net#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (sonic-net#912) pkill -9 zebra for frr warm restart VS test fix (sonic-net#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (sonic-net#907) [debian]: Do not build test when building with real SAI (sonic-net#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (sonic-net#274) Fix MIRROR_SESSION table macro name (sonic-net#264) [schema] Add VNET Route tables in config_db (sonic-net#279) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280) White-list clear_stats op from orchagent to syncd (sonic-net#281) Correct comment (sonic-net#282) sonic-sairedis: [debian]: Change build order in target binary (sonic-net#452) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460) Check if port VID exists in db on flex counter query (sonic-net#464) Full sleep wait change for PFC watchdog (sonic-net#465) Add synchronous clear_stats operation path (sonic-net#463) Modify sai_create_port to breakout a port for virtual switch (sonic-net#454) Fix typo (sonic-net#467) Signed-off-by: Shu0T1an ChenG <[email protected]>

sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (#839) Set LAG mtu value based on kernel netlink msg (#922) [orchagent]: Remove try/catch for correct coredump file (#790) [aclorch] unittest by gtest (#924) [orchagent]: Added support of PFC WD for BFN platform (#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (#912) pkill -9 zebra for frr warm restart VS test fix (#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (#907) [debian]: Do not build test when building with real SAI (#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (#274) Fix MIRROR_SESSION table macro name (#264) [schema] Add VNET Route tables in config_db (#279) [debian] increment debian compatibility to 10 to enable parallel package build (#280) White-list clear_stats op from orchagent to syncd (#281) Correct comment (#282) sonic-sairedis: [debian]: Change build order in target binary (#452) [debian] increment debian compatibility to 10 to enable parallel package build (#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (#460) Check if port VID exists in db on flex counter query (#464) Full sleep wait change for PFC watchdog (#465) Add synchronous clear_stats operation path (#463) Modify sai_create_port to breakout a port for virtual switch (#454) Fix typo (#467) Signed-off-by: Shu0T1an ChenG <[email protected]>

…l_issue Fix small issue in cli'

* Update src/sonic-swss-common from branch 'broadcom_sonic' to 124d498601ff860736888c2ece1c9753b4da41b9 - Merge 201904 branch to broadcom_sonic branch on Mon Jul 1 13:57:58 PDT 2019 Change-Id: I38ebacb16ce081d657b369dadb0ae213737484b0 - Correct comment (sonic-net#282) Signed-off-by: Wenda Ni <[email protected]> - White-list clear_stats op from orchagent to syncd (sonic-net#281) Signed-off-by: Wenda Ni <[email protected]> - [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280) From debhelper man pages: "If neither option is specified, debhelper currently defaults to --parallel in compat 10 (or later) and --no-parallel otherwise." - [schema] Add VNET Route tables in config_db (sonic-net#279) * Add VNET Route tables in config_db * fix the space alignment * address alighment by replacing tab with space - Fix MIRROR_SESSION table macro name (sonic-net#264) Signed-off-by: Jipan Yang <[email protected]> - Add schema for dot1p to tc mapping config table (sonic-net#274) Signed-off-by: Wenda Ni <[email protected]>

…ic-net#274)

For easier testing when using python framework

Master key encryption HLD.

platform-daemon: * 17f886d 2022-07-18 | [ycabled] remove some redundant logging for active-active cable type (sonic-net#274) (HEAD -> 202205, github/202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>

platform-daemon: * 17f886d 2022-07-18 | [ycabled] remove some redundant logging for active-active cable type (#274) (HEAD -> 202205, github/202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>

sonic-platform-daemon submodule update 005ec30 [ycabled] remove some redundant logging for active-active cable type (sonic-net#274) e889625 [ycabled][grpc] Fix some time interval,options for grpc keep alive to work (sonic-net#271) 1651050 [ycabled] add some retry logic for gRPC channel setup;fix no channel gRPC notification (sonic-net#269) 7c0be24 [CMIS]Improved 400G link bring up sequence (sonic-net#254) df447b4 [ycabled] Fix the init values for active-active ports (sonic-net#266) ec84af4 [sonic-ycabled] fix grpc logic for timeout,cli HWSTATUS value retrival logic for active-active cable (sonic-net#264)

sonic-platform-daemon submodule update 005ec30 [ycabled] remove some redundant logging for active-active cable type (#274) e889625 [ycabled][grpc] Fix some time interval,options for grpc keep alive to work (#271) 1651050 [ycabled] add some retry logic for gRPC channel setup;fix no channel gRPC notification (#269) 7c0be24 [CMIS]Improved 400G link bring up sequence (#254) df447b4 [ycabled] Fix the init values for active-active ports (#266) ec84af4 [sonic-ycabled] fix grpc logic for timeout,cli HWSTATUS value retrival logic for active-active cable (#264) Co-authored-by: Jaganathan Anbalagan <[email protected]>

platform-daemon: * 17f886d 2022-07-18 | [ycabled] remove some redundant logging for active-active cable type (sonic-net#274) (HEAD -> 202205, github/202205) [vdahiya12] Signed-off-by: Ying Xie <[email protected]>

Update sonic-snmpagent submodule pointer to include the following: * 4f55473 Use github code scanning instead of LGTM ([sonic-net#274](sonic-net/sonic-snmpagent#274)) Signed-off-by: dprital <[email protected]>

Update sonic-snmpagent submodule pointer to include the following: * 4f55473 Use github code scanning instead of LGTM ([#274](sonic-net/sonic-snmpagent#274)) Signed-off-by: dprital <[email protected]>

#### Why I did it Include below commits: ``` 7147354 2023-02-14 | Fix: zero route may have empty nexthop (#276) [Qi Luo] e60a64c 2022-11-30 | Use github code scanning instead of LGTM (#274) [Liu Shilong] ```

…onic-net#274) This change is required for stop posting MUX_CABLE_INFO entries into state DB for active-active cable_type since for these cables there is no i2c/eeprom or muxcable. This loop is independent of main loop, hence it needs to be changed separately Description Motivation and Context How Has This Been Tested? Unit-tests Signed-off-by: vaibhav-dahiya <[email protected]>

Merge latest upstream changes and add bookworm support for bluefield

…lly (#19896) #### Why I did it src/sonic-gnmi ``` * 64ed32b - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #274 from isabelmsft/file_stat_gnoi (5 days ago) [isabelmsft] * 46df786 - fix spacing (8 days ago) [isabelmsft] * 894ffe6 - fix spacing (8 days ago) [isabelmsft] * 6fe7d32 - fix formatting (8 days ago) [isabelmsft] * 6b435c9 - uncomment check (2 weeks ago) [isabelmsft] * 302ca17 - increase coverage (2 weeks ago) [isabelmsft] * 0b2cb90 - fix local test (2 weeks ago) [isabelmsft] * 7c392c8 - fix syntax (2 weeks ago) [isabelmsft] * e06641d - inc cov atmpt (2 weeks ago) [isabelmsft] * 328e631 - Merge branch 'file_stat_gnoi' of https://github.com/isabelmsft/sonic-gnmi into file_stat_gnoi (3 weeks ago) [isabelmsft] |\ | failure_prs.log 8944bb1 - Merge branch 'master' into file_stat_gnoi (3 weeks ago) [isabelmsft] * | 14bf34a - update test (3 weeks ago) [isabelmsft] |/ * ad0e226 - add UT, clean error (3 weeks ago) [isabelmsft] * 34a94d6 - update (3 weeks ago) [isabelmsft] * d860f28 - update file system (3 weeks ago) [isabelmsft] * 36ec608 - update (3 weeks ago) [isabelmsft] * 3430dd2 - update (3 weeks ago) [isabelmsft] * 0b70222 - update (3 weeks ago) [isabelmsft] * 5236768 - update (3 weeks ago) [isabelmsft] * 0fe0971 - feature change (3 weeks ago) [isabelmsft] ``` #### How I did it #### How to verify it #### Description for the changelog

qiluo-msft reviewed Feb 7, 2017

View reviewed changes

dockers/docker-config-engine/Dockerfile.j2 Outdated

Copy link

Collaborator

qiluo-msft Feb 7, 2017 •

edited

Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra '-'s? {% endfor %}. Also below.

qiluo-msft reviewed Feb 7, 2017

View reviewed changes

[docker-config-engine]: introduce docker sonic config engine

6001d63

sonic config engine provide the sonic configure engine for all sonic dockers that rely on the engine to generate runtime configuration.

lguohan force-pushed the cfg branch from ae15b6d to 37e7776 Compare February 7, 2017 18:05

lguohan force-pushed the cfg branch from 37e7776 to 6001d63 Compare February 7, 2017 18:06

qiluo-msft approved these changes Feb 7, 2017

View reviewed changes

taoyl-ms reviewed Feb 7, 2017

View reviewed changes

change docker dhcp-relay and platform-monitor to simple docker image …

279d5bc

…type

taoyl-ms approved these changes Feb 7, 2017

View reviewed changes

mv Dockerfile.j2 to Dockerfile for dhcp-relay and platform-monitor do…

c7e9965

…cker

lguohan merged commit b6753e7 into sonic-net:master Feb 8, 2017

lguohan deleted the cfg branch November 6, 2017 04:31

stcheng mentioned this pull request Jun 12, 2019

[swss]: Update swss submodules change #2995

Merged

Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019

Merge pull request sonic-net#274 from pavel-shirshov/pavelsh/fix_smal…

27ae651

…l_issue Fix small issue in cli'

madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020

[aclorch]: Fix remove_acl_counter function to remove the counter (son…

c6dcc1e

…ic-net#274)

dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020

Add virtual switch unittests channel via redis (sonic-net#274)

2afbae5

For easier testing when using python framework

sg893052 pushed a commit to sg893052/sonic-buildimage that referenced this pull request Apr 25, 2022

Merge pull request sonic-net#274 from BRCM-SONIC/masterkey_infra

7649544

Master key encryption HLD.

yxieca mentioned this pull request Jul 18, 2022

[202205][platform-daemon] move submodule head #11475

Merged

jaganbal-a mentioned this pull request Jul 21, 2022

submodule update- src/sonic-platform-daemon #11516

Merged

vivekrnv pushed a commit to vivekrnv/sonic-buildimage that referenced this pull request Mar 18, 2024

Merge pull request sonic-net#274 from nvidia-sonic/bluefield_bookworm

cf03b67

Merge latest upstream changes and add bookworm support for bluefield

		RUN apt-get -y install python-lxml python-jinja2 python-netaddr python-ipaddr python-yaml


		COPY \

Conversation

lguohan commented Feb 7, 2017

Uh oh!

lguohan commented Feb 7, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Feb 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qiluo-msft left a comment

Choose a reason for hiding this comment

Uh oh!

lguohan commented Feb 7, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

taoyl-ms commented Feb 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

qiluo-msft Feb 7, 2017 •

edited

Loading

taoyl-ms commented Feb 7, 2017 •

edited

Loading