mirror of
https://github.com/moghtech/komodo.git
synced 2026-04-29 04:10:01 -05:00
1.14.1 (#69)
* 1.14.1 * 1.14.1 version * repo pull use configured repo path * don't show UI defined file if using Stack files on host mode * Stack "run build" option * note on bind mounts * improve bind mount doc * add links to schema * add new stacks configs UI * interp into stack build_extra_args * add links UI
This commit is contained in:
@@ -38,8 +38,11 @@ pub async fn pull(
|
||||
None => "main".to_string(),
|
||||
};
|
||||
|
||||
// This will remove any intermediate '/./' which can be a problem for some OS.
|
||||
let path = path.components().collect::<PathBuf>();
|
||||
|
||||
let command =
|
||||
format!("cd {} && git pull -f origin {branch}", path.display());
|
||||
format!("cd {} && git pull --force origin {branch}", path.display());
|
||||
|
||||
let pull_log = run_komodo_command("git pull", command).await;
|
||||
|
||||
@@ -58,7 +61,7 @@ pub async fn pull(
|
||||
logs.push(reset_log);
|
||||
}
|
||||
|
||||
let (hash, message) = match get_commit_hash_log(path).await {
|
||||
let (hash, message) = match get_commit_hash_log(&path).await {
|
||||
Ok((log, hash, message)) => {
|
||||
logs.push(log);
|
||||
(Some(hash), Some(message))
|
||||
@@ -78,7 +81,7 @@ pub async fn pull(
|
||||
environment,
|
||||
env_file_path,
|
||||
secrets,
|
||||
path,
|
||||
&path,
|
||||
&mut logs,
|
||||
)
|
||||
.await
|
||||
@@ -206,6 +209,8 @@ where
|
||||
.context("destination is not valid path")?,
|
||||
None => repo_dir.join(name),
|
||||
};
|
||||
// This will remove any intermediate '/./' which can be a problem for some OS.
|
||||
let repo_dir = repo_dir.components().collect::<PathBuf>();
|
||||
|
||||
let mut logs = clone_inner(
|
||||
provider,
|
||||
|
||||
Reference in New Issue
Block a user