diff --git a/.github/release-body.md b/.github/release-body.md index a9b7b47..26e3358 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,15 +1,20 @@ -### 2023-08-28 +### 2023-10-21 ### Chores -+ dependencies updated, [8ce5a1877a8c56d9bbab560c97e2596ea87cc4c0], [94a20584e6ef0701c9f36838b0dfbcd911698dbe], [29e02e0d1faae4a836c7e5cfd0d791338ff586e3], [8e4c2e686761df56920df2267b765ab1297c9972] -+ `_typos.toml` added, [84ba1020939606abf4a287cbd1de1f3a10d3f0c0] ++ docker-compose Alpine bump, [d46c425fa29f3c1d27bd57764748bae7e0b82f69] ++ dependencies updated, [e6eecbbdce9c0ccff42aa8806dddb6e3364f990c], [ec93115ece83002fa127f3358f573319e29357e1], [b36daa5aeaa354b6c4f45b7ae67ac1a6345ea1c0], [9c0de1f0feff3165d0f5b6cb5dda843c124bcfa4], [6dd953df458096aee5914411ce40e46c3f600ede] ++ Rust 1.73 linting, [21234c66c3935330ccd58543dd3a915a293ac776] -### Features -+ Custom hostname. `oxker` will use `$DOCKER_HOST` env if set, or one can use the cli argument `--host`, which takes priority over the `$DOCKER_HOST`, closes #30, [10950787649d2b66fc1e8cd8b85526df51479857] +### Docs ++ README.md updated, [3fd3915b3e929742d8007109fd4c7b4a345eb0fa] ### Refactors -+ `set_error()` takes `gui_state` and error enum, to make sure app_data & gui_state is in sync [62c78dfaa50a8d8c084f7fbf7e203b50aaa731ae] -+ `fn loading_spin` doesn't need to be async, [2e27462d1b3f0bdb27d7646511e36d0c9af07f3e] ++ LogsTZ from `&str`, [44f581f5b3652cc4e623fe145141878754dca292] ++ from string impl, [ca79893df5f05ebf445ce194d578cb8213c9755e] ++ env handling, [18c3ed43376a8b5e2d285d1b34a9f96843357d53] ++ `parse_args/mod.rs` > `parse_args.rs`, [a6ff4124319ed17d3f1c46c916418f850ef1d3b0] ++ set_info_box take `&str`, [faeaca0cd1bb243c7f4a7112b928be776b877ca1] ++ GitHub action use concurrency matrix, re-roder workflow, [85f1982f4066bfdbc764ab7b88588eded6a17f96] see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index 54f6841..1481fbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,21 @@ +# v0.3.3 +### 2023-10-21 + ### Chores -+ docker-compose Alpine bump, [d46c425fa29f3c1d27bd57764748bae7e0b82f69] -+ dependencies updated, [e6eecbbdce9c0ccff42aa8806dddb6e3364f990c], [ec93115ece83002fa127f3358f573319e29357e1], [b36daa5aeaa354b6c4f45b7ae67ac1a6345ea1c0], [9c0de1f0feff3165d0f5b6cb5dda843c124bcfa4], [6dd953df458096aee5914411ce40e46c3f600ede] -+ Rust 1.73 linting, [21234c66c3935330ccd58543dd3a915a293ac776] ++ docker-compose Alpine bump, [d46c425f](https://github.com/mrjackwills/oxker/commit/d46c425fa29f3c1d27bd57764748bae7e0b82f69) ++ dependencies updated, [e6eecbbd](https://github.com/mrjackwills/oxker/commit/e6eecbbdce9c0ccff42aa8806dddb6e3364f990c), [ec93115e](https://github.com/mrjackwills/oxker/commit/ec93115ece83002fa127f3358f573319e29357e1), [b36daa5a](https://github.com/mrjackwills/oxker/commit/b36daa5aeaa354b6c4f45b7ae67ac1a6345ea1c0), [9c0de1f0](https://github.com/mrjackwills/oxker/commit/9c0de1f0feff3165d0f5b6cb5dda843c124bcfa4), [6dd953df](https://github.com/mrjackwills/oxker/commit/6dd953df458096aee5914411ce40e46c3f600ede) ++ Rust 1.73 linting, [21234c66](https://github.com/mrjackwills/oxker/commit/21234c66c3935330ccd58543dd3a915a293ac776) ### Docs -+ README.md updated, [3fd3915b3e929742d8007109fd4c7b4a345eb0fa] ++ README.md updated, [3fd3915b](https://github.com/mrjackwills/oxker/commit/3fd3915b3e929742d8007109fd4c7b4a345eb0fa) ### Refactors -+ LogsTZ from `&str`, [44f581f5b3652cc4e623fe145141878754dca292] -+ from string impl, [ca79893df5f05ebf445ce194d578cb8213c9755e] -+ env handling, [18c3ed43376a8b5e2d285d1b34a9f96843357d53] -+ `parse_args/mod.rs` > `parse_args.rs`, [a6ff4124319ed17d3f1c46c916418f850ef1d3b0] -+ set_info_box take `&str`, [faeaca0cd1bb243c7f4a7112b928be776b877ca1] -+ GitHub action use concurrency matrix, re-roder workflow, [85f1982f4066bfdbc764ab7b88588eded6a17f96] ++ LogsTZ from `&str`, [44f581f5](https://github.com/mrjackwills/oxker/commit/44f581f5b3652cc4e623fe145141878754dca292) ++ from string impl, [ca79893d](https://github.com/mrjackwills/oxker/commit/ca79893df5f05ebf445ce194d578cb8213c9755e) ++ env handling, [18c3ed43](https://github.com/mrjackwills/oxker/commit/18c3ed43376a8b5e2d285d1b34a9f96843357d53) ++ `parse_args/mod.rs` > `parse_args.rs`, [a6ff4124](https://github.com/mrjackwills/oxker/commit/a6ff4124319ed17d3f1c46c916418f850ef1d3b0) ++ set_info_box take `&str`, [faeaca0c](https://github.com/mrjackwills/oxker/commit/faeaca0cd1bb243c7f4a7112b928be776b877ca1) ++ GitHub action use concurrency matrix, re-roder workflow, [85f1982f](https://github.com/mrjackwills/oxker/commit/85f1982f4066bfdbc764ab7b88588eded6a17f96) # v0.3.2 ### 2023-08-28 diff --git a/Cargo.lock b/Cargo.lock index 12ba50b..f4731fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -714,7 +714,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index 1baf43e..e0055f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.3.2" +version = "0.3.3" edition = "2021" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers" diff --git a/src/app_data/container_state.rs b/src/app_data/container_state.rs index 607baa8..08f0785 100644 --- a/src/app_data/container_state.rs +++ b/src/app_data/container_state.rs @@ -248,7 +248,7 @@ impl PartialEq for CpuStats { impl PartialOrd for CpuStats { fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) + Some(self.cmp(other)) } } @@ -291,7 +291,7 @@ impl PartialEq for ByteStats { impl PartialOrd for ByteStats { fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) + Some(self.cmp(other)) } } diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index 903090e..6a851a9 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -569,7 +569,10 @@ impl AppData { .map_or(false, |i| i.starts_with(ENTRY_POINT)); let state = State::from(i.state.as_ref().map_or("dead", |z| z)); - let status = i.status.as_ref().map_or(String::new(), std::clone::Clone::clone); + let status = i + .status + .as_ref() + .map_or(String::new(), std::clone::Clone::clone); let image = i .image diff --git a/src/main.rs b/src/main.rs index 6b15751..ef3e279 100644 --- a/src/main.rs +++ b/src/main.rs @@ -69,12 +69,9 @@ fn check_if_containerised() -> bool { /// Read the optional docker_host path, the cli args take priority over the DOCKER_HOST env fn read_docker_host(args: &CliArgs) -> Option { - args.host.as_ref().map_or_else( - || { - std::env::var(DOCKER_HOST).ok() - }, - |x| Some(x.to_string()), - ) + args.host + .as_ref() + .map_or_else(|| std::env::var(DOCKER_HOST).ok(), |x| Some(x.to_string())) } /// Create docker daemon handler, and only spawn up the docker data handler if a ping returns non-error