Skip to content

[dockers] Refactor Dockerfiles #3048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 22, 2019
Merged

[dockers] Refactor Dockerfiles #3048

merged 1 commit into from
Jun 22, 2019

Conversation

stepanblyschak
Copy link
Collaborator

  • create a dockerfile-marcros.j2 file with all common operations
    written as j2 macro
  • use single dockerfile instruction for COPY and RUN commands
    when possible to improve build time
  • reorganize dockerfile instructions to make more cache friendly
    (in case someday we will remove --no-cache to build docker images)

Signed-off-by: Stepan Blyschak [email protected]

- What I did

  • Refarctor Dockerfiles
  • Remove code duplication in Dockerfiles by creating a j2 file with common macros
  • Improved build time by reducing number of steps in Dockerfile
    (e.g. for SNMP docker - 27 minutes to 11 minutes)

- How I did it

- How to verify it
Build mellanox image, install on DUT, run few tests to verify each docker functionality (lldp, snmp, bgp_fact, fib)

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Improve dockerfile instructions
326ea02 
- create a dockerfile-marcros.j2 file with all common operations
  written as j2 macro
- use single dockerfile instruction for COPY and RUN commands
  when possible to improve build time
- reorganize dockerfile instructions to make more cache friendly
  (in case someday we will remove --no-cache to build docker images)

Signed-off-by: Stepan Blyschak <[email protected]>
@lguohan lguohan merged commit 81cf332 into sonic-net:master Jun 22, 2019
@stepanblyschak stepanblyschak deleted the dockerfile_refactor branch September 23, 2022 13:30
yxieca pushed a commit that referenced this pull request Nov 30, 2023
@saiarcot895
Update sonic-utilities to master branch version (#17297)
ddd1f43 
* Update sonic-utilities to master branch version

sonic-utilities was (intentionally) pointing to a commit on a fork,
since merging sonic-utilities's changes for Bookworm first onto the
master branch would result in PR checker failures. Now that
sonic-buildimage is on master branch and the Bookworm changes in
sonic-utilities have been merged into master, sonic-utilties can now
point to master.

17e77fe Revert "Run yang validation in unit test (#3025)" (#3055)
96dd555 [dhcp_relay] Fix dhcp_relay counter display issue (#3054)
6dfeee6 [sflow][db_migrator] Egress Sflow support (#3020)
02a588b Don't collect /proc/sched_debug
d7ec325 Fix error about having a mutable default for field headers in dataclass
0ab3ab91 Fix test execution on Bookworm (#3041)
ef8f6f8 Specify test dependencies under extra_requires
61c44e8 Update python packages
1e81310 [wol] Implement wol command line utility (#3048)
8ebc56a [sonic_installer]: Improve exception handling: introduce notes. (#3029)
3610ce9 [sonic-package-manager] Fix YANG validation failure on upgrade when feature has constraints in YANG model on FEATURE table (#2933)
cfd2dd3 Add container rsyslog.conf to the sys dump (#3039)
c4b0782 Support new platform in generic configuration update (#3038)
a8d236c [fast-reboot-filter-routes.py] Remove click and improve error reporting (#3030)
75199c0 [sonic-package-manager] insert newline in /etc/sonic/generated_services.conf (#3040)
cd85569 [VOQ][saidump] Modify generate_dump: replace save_saidump with save_saidump_by_route_size (#2972)
f1e24ae GCU support for Cisco-8000 features (#3010)
67e1c3d Update GCU rsyslog validator (#3012)
253b797 [sonic-package-manager] do not modify config_db.json (#3032)
177dd8e [sonic-package-manager] add generated service to /etc/sonic/generated_services.conf (#3037)
62fcd77 Configure NTP according to extended configuration (#2835)
ced0940 [dualtor_neighbor_check] Adjust zero-mac check condition (#3034)
a4eeb69 [config] config reload should generate sysinfo if missing  (#3031)
e01fc89 Run yang validation in unit test (#3025)

Signed-off-by: Saikrishna Arcot <[email protected]>
yxieca pushed a commit that referenced this pull request Dec 14, 2023
@mssonicbld
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
0cb0891 
…atically (#17457)

src/sonic-utilities

* 1b1402f5 - (HEAD -> 202311, origin/202311) [hash]: Add ECMP/LAG hash algorithm CLI (#3036) (9 days ago) [Nazarii Hnydyn]
* 71514ea3 - Revert "Run yang validation in unit test (#3025)" (#3055) (9 days ago) [Ying Xie]
* b5daf5d4 - [dhcp_relay] Fix dhcp_relay counter display issue (#3054) (9 days ago) [Yaqiang Zhu]
* b3172505 - [sflow][db_migrator] Egress Sflow support (#3020) (9 days ago) [Rajkumar-Marvell]
* 1e81310 - [wol] Implement wol command line utility (#3048) (3 weeks ago) [Zhijian Li]
* 8ebc56a - [sonic_installer]: Improve exception handling: introduce notes. (#3029) (3 weeks ago) [Nazarii Hnydyn]
* 3610ce9 - [sonic-package-manager] Fix YANG validation failure on upgrade when feature has constraints in YANG model on FEATURE table (#2933) (3 weeks ago) [Stepan Blyshchak]
* cfd2dd3 - Add container rsyslog.conf to the sys dump (#3039) (4 weeks ago) [Vivek]
* c4b0782 - Support new platform in generic configuration update (#3038) (4 weeks ago) [Stephen Sun]
* a8d236c - [fast-reboot-filter-routes.py] Remove click and improve error reporting (#3030) (4 weeks ago) [Stepan Blyshchak]
* 75199c0 - [sonic-package-manager] insert newline in /etc/sonic/generated_services.conf (#3040) (4 weeks ago) [Stepan Blyshchak]
* cd85569 - [VOQ][saidump] Modify generate_dump: replace save_saidump with save_saidump_by_route_size (#2972) (4 weeks ago) [JunhongMao]
* f1e24ae - GCU support for Cisco-8000 features (#3010) (4 weeks ago) [rbpittman]
* 67e1c3d - Update GCU rsyslog validator (#3012) (4 weeks ago) [jingwenxie]
* 253b797 - [sonic-package-manager] do not modify config_db.json (#3032) (5 weeks ago) [Stepan Blyshchak]
* 177dd8e - [sonic-package-manager] add generated service to /etc/sonic/generated_services.conf (#3037) (5 weeks ago) [Stepan Blyshchak]
* 62fcd77 - Configure NTP according to extended configuration (#2835) (5 weeks ago) [Yevhen Fastiuk]
* ced0940 - [dualtor_neighbor_check] Adjust zero-mac check condition (#3034) (5 weeks ago) [Longxiang Lyu]
* a4eeb69 - [config] config reload should generate sysinfo if missing  (#3031) (6 weeks ago) [jingwenxie]
* e01fc89 - Run yang validation in unit test (#3025) (6 weeks ago) [ganglv]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleveque jleveque jleveque approved these changes

Assignees
No one assigned
Labels
Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stepanblyschak @jleveque @lguohan