Commit 56e5f13
committed
[docker] Fix Docker commands hanging before docker.service starts
#### Why I did it
Fix Docker socket activation broken since PR sonic-net#2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.
**Fixes sonic-net#25383**
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
Changed `-H unix://` to `-H fd://` in `files/docker/docker.service.conf`. Added documentation comments explaining why this flag is required to prevent future regression.
#### How to verify it
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
Verified on VS image:
- docker.socket is active and triggers docker.service
- dockerd runs with -H fd:// flag
- Socket activation works correctly
#### 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
-->
- [x] 202305
- [x] 202311
- [x] 202405
- [x] 202411
- [x] 202505
- [x] 202511
**Reason:** This is a bug fix that has existed since January 2019. All active release branches are affected and should receive this fix.
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [x] master : `fix_docker-socket-activation-25383.0-b01504e6c` (sonic-vs.img.gz)
#### Description for the changelog
Fix Docker socket activation hang by using -H fd:// instead of -H unix:// in docker.service.conf
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### 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-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
N/A
#### A picture of a cute animal (not mandatory but encouraged)
1 parent 9408878 commit 56e5f13
1 file changed
Lines changed: 11 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
1 | 11 | | |
2 | 12 | | |
3 | 13 | | |
4 | | - | |
| 14 | + | |
0 commit comments