Fix missing Init Binary in docker info output #32469
Conversation
| { | ||
| config: &Config{}, | ||
| expectedInitPath: "docker-init", | ||
| }, |
There was a problem hiding this comment.
Perhaps we should have a test-case where InitPath is set as well?
There was a problem hiding this comment.
@thaJeztah yep, missed that out 😬
There was a problem hiding this comment.
@thaJeztah Added that too.
There was a problem hiding this comment.
oh, I'm gonna be a PITA; can you add one with both InitPath and DefaultInitBinary set, so that we test that InitPath correctly overrides DefaultInitBinary?
And when you added that, can you "squash" your commits, so that there's only a single commit in this PR? 😅
There was a problem hiding this comment.
@thaJeztah lol! that's alright 😁 Added another test-case and squashed the commits.
darkowlzz
force-pushed
the
32314-fix-default-init-binary-value
branch
from
75fd141
to
5d7d2d2
Compare
| { | ||
| config: &Config{}, | ||
| expectedInitPath: "docker-init", | ||
| }, |
There was a problem hiding this comment.
oh, I'm gonna be a PITA; can you add one with both InitPath and DefaultInitBinary set, so that we test that InitPath correctly overrides DefaultInitBinary?
And when you added that, can you "squash" your commits, so that there's only a single commit in this PR? 😅
- Moved DefaultInitBinary from daemon/daemon.go to daemon/config/config.go since it's a daemon config and is referred in config package files. - Added condition in GetInitPath to check for any explicitly configured DefaultInitBinary. If not, the default value of DefaultInitBinary is returned. - Changed all references of DefaultInitBinary to refer to the variable from new location. - Added TestCommonUnixGetInitPath to test for the various values of GetInitPath. Fixes moby#32314 Signed-off-by: Sunny Gogoi <indiasuny000@gmail.com>
darkowlzz
force-pushed
the
32314-fix-default-init-binary-value
branch
from
5d7d2d2
to
17b1288
Compare
daemon/config/config.go since it's a daemon config and is referred in
config package files.
DefaultInitBinary. If not, the default value of DefaultInitBinary is
returned.
from new location.
DefaultInitBinary.
Fixes #32314
Signed-off-by: Sunny Gogoi indiasuny000@gmail.com
- What I did
Added the missing Init Binary info in
docker infooutput.- How I did it
Details are in commit body.
- How to verify it
Verify by running
docker infoand checking the value ofInit Binaryin the output.- Description for the changelog
Fix missing Init Binary in docker info output.
- A picture of a cute animal (not mandatory but encouraged)