Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
238ad87119 | |||
d584e21fd9 | |||
ac79a2e0b7 | |||
1798c1270b | |||
97d1019b69 | |||
e30ceb75d9 | |||
4681e0c694 |
11
.github/workflows/build.yml
vendored
11
.github/workflows/build.yml
vendored
@@ -189,6 +189,17 @@ jobs:
|
||||
path: |
|
||||
${{ needs.detect-project.outputs.project-dir }}/target/${{ matrix.target }}/release/${{ needs.detect-project.outputs.project-name }}${{ matrix.os == 'windows' && '.exe' || '' }}
|
||||
|
||||
- name: Build documentation
|
||||
working-directory: ${{ needs.detect-project.outputs.project-dir }}
|
||||
run: cargo doc --no-deps
|
||||
|
||||
- name: Deploy to GitHub Pages
|
||||
uses: peaceiris/actions-gh-pages@v3
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: ${{ needs.detect-project.outputs.project-dir }}/target/doc
|
||||
publish_branch: gh-pages
|
||||
|
||||
docker-build:
|
||||
name: Build and Push Docker Image
|
||||
needs: [detect-project, build, set-tag]
|
||||
|
@@ -34,8 +34,8 @@ pub async fn get_available_container(docker: &Docker) -> Vec<DockerContainer> {
|
||||
container.id.as_ref()?; // Skip if no ID
|
||||
|
||||
let id = container.id?;
|
||||
let short_string_id = if id.len() > 12 { &id[..12] } else { &id };
|
||||
let short_id: u32 = short_string_id.trim().parse().unwrap();
|
||||
let short_id = if id.len() > 12 { &id[..12] } else { &id };
|
||||
//let short_id: u32 = short_string_id.trim().parse().unwrap();
|
||||
|
||||
let name = container.names
|
||||
.and_then(|names| names.into_iter().next())
|
||||
@@ -59,7 +59,7 @@ pub async fn get_available_container(docker: &Docker) -> Vec<DockerContainer> {
|
||||
println!(" - ID: {}, Image: {:?}, Name: {}", short_id, container.image, name);
|
||||
|
||||
Some(DockerContainer {
|
||||
ID: short_id,
|
||||
ID: short_id.to_string(),
|
||||
image,
|
||||
Name: name,
|
||||
Status: status,
|
||||
|
@@ -63,7 +63,7 @@ impl DockerContainer {
|
||||
///
|
||||
/// # Returns
|
||||
/// * `Result<u32, Box<dyn Error + Send + Sync>>` - Container ID as integer.
|
||||
pub async fn get_docker_container_id(container: DockerContainer) -> Result<u32, Box<dyn Error + Send + Sync>> {
|
||||
pub async fn get_docker_container_id(container: DockerContainer) -> Result<String, Box<dyn Error + Send + Sync>> {
|
||||
Ok(container.ID)
|
||||
}
|
||||
|
||||
|
@@ -109,7 +109,7 @@ impl Collector {
|
||||
ram_load: hardware.memory.current_load.unwrap_or_default(),
|
||||
ram_size: hardware.memory.total_size.unwrap_or_default(),
|
||||
disk_size: hardware.disk.total_size.unwrap_or_default(),
|
||||
disk_usage: hardware.disk.total_used.unwrap_or_default(),
|
||||
disk_usage: hardware.disk.total_usage.unwrap_or_default(),
|
||||
disk_temp: 0.0, // not supported
|
||||
net_rx: hardware.network.rx_rate.unwrap_or_default(),
|
||||
net_tx: hardware.network.tx_rate.unwrap_or_default(),
|
||||
|
@@ -187,7 +187,7 @@ pub struct Acknowledgment {
|
||||
/// - `_cpu_load`: CPU usage as a percentage (**0.0–100.0**)
|
||||
#[derive(Debug, Serialize, Clone)]
|
||||
pub struct DockerContainer {
|
||||
pub ID: u32,
|
||||
pub ID: String,
|
||||
pub image: String,
|
||||
pub Name: String,
|
||||
pub Status: String, // "running";"stopped";others
|
||||
|
Reference in New Issue
Block a user