[action] [PR:25398] [docker] Fix Docker commands hanging before docker.service starts#25503
Merged
mssonicbld merged 1 commit intosonic-net:202511from Mar 12, 2026
Merged
Conversation
#### 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) 
Collaborator
Author
|
Original PR: #25398 |
7 tasks
Contributor
|
/azpw run |
Collaborator
Author
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
Fix Docker socket activation broken since PR #2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.
Fixes #25383
Work item tracking
How I did it
Changed
-H unix://to-H fd://infiles/docker/docker.service.conf. Added documentation comments explaining why this flag is required to prevent future regression.How to verify it
Verified on VS image:
Which release branch to backport (provide reason below if selected)
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)
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
Link to config_db schema for YANG module changes
N/A
A picture of a cute animal (not mandatory but encouraged)