cli/connhelper: support overriding the docker binary over SSH #5627
Conversation
This file contains 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
mattmacleod
force-pushed
the
5626-allow-binary-override-over-ssh
branch
from
951dcee
to
1fdc2b8
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5627 +/- ##
=======================================
Coverage 59.50% 59.51%
=======================================
Files 346 346
Lines 29365 29371 +6
=======================================
+ Hits 17474 17480 +6
Misses 10916 10916
Partials 975 975 |
laurazard
reviewed
Nov 18, 2024
cli/connhelper/connhelper.go
Outdated
| @@ -49,7 +56,7 @@ func getConnectionHelper(daemonURL string, sshFlags []string) (*ConnectionHelper | |||
| sshFlags = disablePseudoTerminalAllocation(sshFlags) | |||
| return &ConnectionHelper{ | |||
| Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) { | |||
| args := []string{"docker"} | |||
| args := []string{dockerSSHRemoteBinary()} | |||
There was a problem hiding this comment.
Having this inside of the Dialer means that it'll possibly get evaluated multiple times during a single CLI invocation – so, if something unexpected happens causing the environment variable to get unset while the process is running and Dialer gets called again a different value would get returned.
I think it'd be safer to move this evaluation up to L56 to make sure it only happens once.
There was a problem hiding this comment.
something like
remoteDockerBinary := dockerSSHRemoteBinary()
return &ConnectionHelper{
Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
args := []string{remoteDockerBinary}
...There was a problem hiding this comment.
Great point – thanks @laurazard! I've updated as suggested.
mattmacleod
force-pushed
the
5626-allow-binary-override-over-ssh
branch
from
f5737e8
to
82352ff
Compare
This change adds the ability to override the docker binary used when executing commands over SSH. This is useful when the docker binary is not in the PATH of the SSH user, or when the binary is not named `docker`. If `DOCKER_SSH_REMOTE_BINARY` is set in the environment, the value will be used as the docker binary when executing commands over SSH. If the environment variable is not set, the default value of `docker` will be used. Signed-off-by: Matthew MacLeod <matt@umm.io>
Signed-off-by: Matthew MacLeod <matt@umm.io>
mattmacleod
force-pushed
the
5626-allow-binary-override-over-ssh
branch
from
82352ff
to
43dd6ea
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change adds the ability to override the docker binary used when executing commands over SSH. This is useful when the docker binary is not in the PATH of the SSH user, or when the binary is not named
docker.If
DOCKER_SSH_REMOTE_BINARYis set in the environment, the value will be used as the docker binary when executing commands over SSH. If the environment variable is not set, the default value ofdockerwill be used.Closes #5626
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)