Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
bb55b46c34 | |||
76d54cb433 | |||
4dc8c56a5c |
@@ -55,7 +55,7 @@ impl DockerManager {
|
|||||||
|
|
||||||
Ok(containers
|
Ok(containers
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.find(|c| c.image == client_image)
|
.find(|c| c.image.contains(client_image))
|
||||||
.map(|container| DockerContainerDto {
|
.map(|container| DockerContainerDto {
|
||||||
id: container.id,
|
id: container.id,
|
||||||
image: container.image,
|
image: container.image,
|
||||||
@@ -66,13 +66,13 @@ impl DockerManager {
|
|||||||
/// Gets the current client version (image name) if running in Docker
|
/// Gets the current client version (image name) if running in Docker
|
||||||
pub async fn get_client_version(&self) -> String {
|
pub async fn get_client_version(&self) -> String {
|
||||||
match self.get_client_container().await {
|
match self.get_client_container().await {
|
||||||
Ok(Some(container)) => container.image,
|
Ok(Some(container)) => container.image.split(':').next().unwrap_or("unknown").to_string(),
|
||||||
Ok(None) => {
|
Ok(None) => {
|
||||||
eprintln!("Warning: No WatcherAgent container found");
|
println!("Warning: No WatcherAgent container found");
|
||||||
"unknown".to_string()
|
"unknown".to_string()
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
eprintln!("Warning: Could not get current image version: {}", e);
|
println!("Warning: Could not get current image version: {}", e);
|
||||||
"unknown".to_string()
|
"unknown".to_string()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user