diff --git a/.github/release-body.md b/.github/release-body.md index f9cc715..fb102b3 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,23 +1,13 @@ -### 2023-03-30 +### 2023-06-04 ### Chores -+ dependencies updated, [7a9bdc9699594532e17a33e044ca0678693c8d3f], [58e03a750fe89b914b9069cb0c6c02a3d0929439], [b246e8c25af0c5136953afca7c694cda66550d9b] - -### Docs -+ README.md and screenshot updated, [73ab7580c61dd59c59f10872629111360afb9033] - -### Features -+ Ability to delete a container, be warned, as this will force delete, closes #27, [937202fe34d1692693c62dd1a7ad19db37651233], [b25f8b18f4f2acd5c9af4a1d40655761d1bd720e] -+ Publish images to `ghcr.io` as well as Docker Hub, and correctly tag images with `latest` and the current sermver, [cb1271cf7f21c898020481ad85914a3dcc83ec93] -+ Replace `tui-rs` with [ratatui](https://github.com/tui-rs-revival/ratatui), [d431f850219b28af2bc45f3b6917377604596a40] ++ github workflow ubuntu latest, build for x86 musl, [4fa841e6e74e3e10e3d3e82eac1a1ca1338814cf] ++ dependencies updated, [0caa92f6a4728d50d8b2d8f15d96a21112732ec5], [1fd1dfc75d6fa4e84451ebc845b9e1c730381f41] ++ `Spans` -> `Line`, ratatui 0.21 update, [4679ddc885a9b35c901f3600b63fd9e86118264c], [0d37ac55018038363e5f92dc4215996f8cff7b2e] ++ `create_release.sh` updated, [7dec5f14a381d237c5e72fbf9551bcf398f93f3e] ### Fixes -+ out of bound bug in `heading_bar()`, [b9c125da46fe0eb4aae15c354d87ac824e9cb83a] -+ `-d` arg error text updated, [e0b49be84062abdfcb636418f57043fad37d06ec] - -### Refactors -+ `popup()` use `saturating_x()` rather than `checked_x()`, [d628e8029942916053b3b7e72d363b1290fc5711] -+ button_item() include brackets, [7c92ffef7da20143a31706a310b5e6f2c3e0554f] ++ workflow additional image fix, closes #29, [47cda44b8213cfb8c3807df6c43e3f5dc2452b57] see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index c705dbe..e64a09d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ +# v0.3.1 +### 2023-06-04 + ### Chores -+ github workflow ubuntu latest, build for x86 musl, [4fa841e6e74e3e10e3d3e82eac1a1ca1338814cf] -+ dependencies updated, [0caa92f6a4728d50d8b2d8f15d96a21112732ec5], [1fd1dfc75d6fa4e84451ebc845b9e1c730381f41] -+ `Spans` -> `Line`, ratatui 0.21 update, [4679ddc885a9b35c901f3600b63fd9e86118264c], [0d37ac55018038363e5f92dc4215996f8cff7b2e] -+ `create_release.sh` updated, [7dec5f14a381d237c5e72fbf9551bcf398f93f3e] ++ github workflow ubuntu latest, build for x86 musl, [4fa841e6](https://github.com/mrjackwills/oxker/commit/4fa841e6e74e3e10e3d3e82eac1a1ca1338814cf) ++ dependencies updated, [0caa92f6](https://github.com/mrjackwills/oxker/commit/0caa92f6a4728d50d8b2d8f15d96a21112732ec5), [1fd1dfc7](https://github.com/mrjackwills/oxker/commit/1fd1dfc75d6fa4e84451ebc845b9e1c730381f41) ++ `Spans` -> `Line`, ratatui 0.21 update, [4679ddc8](https://github.com/mrjackwills/oxker/commit/4679ddc885a9b35c901f3600b63fd9e86118264c), [0d37ac55](https://github.com/mrjackwills/oxker/commit/0d37ac55018038363e5f92dc4215996f8cff7b2e) ++ `create_release.sh` updated, [7dec5f14](https://github.com/mrjackwills/oxker/commit/7dec5f14a381d237c5e72fbf9551bcf398f93f3e) ### Fixes -+ workflow additional image fix, closes #29, [47cda44b8213cfb8c3807df6c43e3f5dc2452b57] ++ workflow additional image fix, closes [#29](https://github.com/mrjackwills/oxker/issues/29), [47cda44b](https://github.com/mrjackwills/oxker/commit/47cda44b8213cfb8c3807df6c43e3f5dc2452b57) # v0.3.0 ### 2023-03-30 diff --git a/Cargo.lock b/Cargo.lock index 767baa5..d2aa8bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -658,7 +658,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index fdcf8fc..e799c31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.3.0" +version = "0.3.1" edition = "2021" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers" diff --git a/src/ui/color_match.rs b/src/ui/color_match.rs index eadb913..2de6ca6 100644 --- a/src/ui/color_match.rs +++ b/src/ui/color_match.rs @@ -3,7 +3,7 @@ pub mod log_sanitizer { use cansi::{v3::categorise_text, Color as CansiColor, Intensity}; use ratatui::{ style::{Color, Modifier, Style}, - text::{Span, Line}, + text::{Line, Span}, }; /// Attempt to colorize the given string to ratatui standards diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs index 2ecf526..6e0586a 100644 --- a/src/ui/draw_blocks.rs +++ b/src/ui/draw_blocks.rs @@ -4,7 +4,7 @@ use ratatui::{ layout::{Alignment, Constraint, Direction, Layout, Rect}, style::{Color, Modifier, Style}, symbols, - text::{Span, Line}, + text::{Line, Span}, widgets::{ Axis, Block, BorderType, Borders, Chart, Clear, Dataset, GraphType, List, ListItem, Paragraph, diff --git a/src/ui/mod.rs b/src/ui/mod.rs index e70dec4..35bd153 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -278,7 +278,8 @@ fn draw_frame( ); if let Some(id) = delete_confirm { - app_data.lock().get_container_name_by_id(&id).map_or_else(|| { + app_data.lock().get_container_name_by_id(&id).map_or_else( + || { // If a container is deleted outside of oxker but whilst the Delete Confirm dialog is open, it can get caught in kind of a dead lock situation // so if in that unique situation, just clear the delete_container id gui_state.lock().set_delete_container(None);