serokell/deploy-rs
1
1
Fork 0
mirror of https://github.com/serokell/deploy-rs.git synced 2024-09-11 10:45:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #198 from serokell/rvem/#197-fix-options-handling-with-remote-build

Browse Source 
[#197] Fix hostname overriding for remote builds
This commit is contained in:
Roman Melnikov 2023-04-21 15:54:10 +08:00 committed by GitHub
commit c2ea4e642d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/push.rs
View File

@ -155,14 +155,12 @@ pub async fn build_profile_remotely(data: &PushProfileData<'_>, derivation_name:
data.deploy_data.profile_name, data.deploy_data.node_name
);
let store_address = format!("ssh-ng://{}@{}",
if data.deploy_data.profile.generic_settings.ssh_user.is_some() {
&data.deploy_data.profile.generic_settings.ssh_user.as_ref().unwrap()
} else {
&data.deploy_defs.ssh_user
},
data.deploy_data.node.node_settings.hostname
);
// TODO: this should probably be handled more nicely during 'data' construction
let hostname = match data.deploy_data.cmd_overrides.hostname {
Some(ref x) => x,
None => &data.deploy_data.node.node_settings.hostname,
};
let store_address = format!("ssh-ng://{}@{}", data.deploy_defs.ssh_user, hostname);
let ssh_opts_str = data.deploy_data.merged_settings.ssh_opts.join(" ");