Allow custom user and port for builder host #620
Merged
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
mlitwiniuk
force-pushed
the
allow_custom_ports_for_ssh
branch
from
9459ff6 to
79bf674
Compare
djmb
reviewed
Mar 6, 2024
lib/kamal/cli/build.rb
Outdated
| @@ -115,7 +115,7 @@ def connect_to_remote_host(remote_host) | |||
| remote_uri = URI.parse(remote_host) | |||
| if remote_uri.scheme == "ssh" | |||
| options = { user: remote_uri.user, port: remote_uri.port }.compact | |||
| on(remote_uri.host, options) do | |||
| on(remote_host.gsub('ssh://', ''), options) do | |||
There was a problem hiding this comment.
I think we could do:
host = SSHKit::Host.new(
hostname: remote_uri.host,
ssh_options: { user: remote_uri.user, port: remote_uri.port }
)
on(host) do
execute "true"
endwhich would avoid needing to alter the options in sshkit_with_ext.rb
There was a problem hiding this comment.
Good catch, I've updated PR accordingly
When ssh options are set, they overwrite username and password passed as ssh builder uri. Passing part of uri for ssh-kit is fine, as it then properly extracts username and password and forwards it as host.ssh_options (in which case it's no longer empty)
mlitwiniuk
force-pushed
the
allow_custom_ports_for_ssh
branch
from
79bf674 to
2f91236
Compare
djmb
reviewed
May 2, 2024
|
Yep, you're right. Closing |
|
@mlitwiniuk - I was just referring to this line when I said we don't need it anymore. I think the rest of the PR is still valid! |
|
Going to re-open as I think we want this change! |
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.
When
sshoptions are set, they overwrite custom username and password passed via ssh builder uri. Passing part of uri for sshkit is fine, as it then properly extracts username and password and forwards it ashost.ssh_options(in which case it's no longer empty)