diff --git a/CHANGELOG.md b/CHANGELOG.md index f79ef7d..05289a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ *BREAKING CHANGES* + `log_scroll_forward`, `log_scroll_back` renamed to `scroll_forward`, `scroll_back` -+ Docker Host priorites reordered, *should* now be, from high to low order, `--host` cli argument, `config.toml` `host` value, `DOKER_HOST` env, [Docker library](https://github.com/fussybeaver/bollard) default setting. ++ Additional KeyMap entry, `inspect` defaults to `i`, enables Inspect mode ++ Docker Host priorites reordered, *should* now be, from high to low order, `--host` cli argument, `config.toml` `host` value, `DOCKER_HOST` env, [Docker library](https://github.com/fussybeaver/bollard) default setting. + `config.toml` `host` value is now commented out by default - this should help with invalid Docker connection errors and enable easy Podman support ### Chores diff --git a/README.md b/README.md index b2fccd4..394121f 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ In application controls, these, amongst many other settings, can be customized w | ```( - ) ``` or ```(=)``` | Reduce or increase the height of the logs panel.| | ```( \ )``` | Toggle the visibility of the logs panel.| | ```( e )``` | Exec into the selected container - not available on Windows.| -| ```( i )``` | Enter container insepct mode. | +| ```( i )``` | Enter container inspect mode. | | ```( f )``` | Force clear the screen & redraw the gui.| | ```( h )``` | Toggle help menu.| | ```( m )``` | Toggle mouse capture - if disabled, text on screen can be selected.| diff --git a/containerised/Dockerfile b/containerised/Dockerfile index e05760a..0f93266 100644 --- a/containerised/Dockerfile +++ b/containerised/Dockerfile @@ -6,7 +6,7 @@ FROM --platform=$BUILDPLATFORM rust:slim AS builder ARG TARGETARCH -# These are build platform depandant, but will be ignored if not needed +# These are build platform dependant, but will be ignored if not needed ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="aarch64-linux-gnu-gcc" ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=+crt-static -C link-arg=-lgcc" ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER="arm-linux-gnueabihf-ld" diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index 1561c1d..9e05986 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -700,7 +700,7 @@ impl AppData { .map(|i| &mut i.docker_controls.state) } - /// Get mutable Option of the currently selected container DockerConmand items + /// Get mutable Option of the currently selected container DockerCommand items pub fn get_control_items(&mut self) -> Option<&mut Vec> { self.get_mut_selected_container() .map(|i| &mut i.docker_controls.items) diff --git a/src/config/color_parser.rs b/src/config/color_parser.rs index 14c505d..8afded3 100644 --- a/src/config/color_parser.rs +++ b/src/config/color_parser.rs @@ -61,7 +61,7 @@ impl From> for AppColors { ); } - // Seletable panel borders + // Selectable panel borders if let Some(b) = config_colors.borders { Self::map_color(b.selected.as_deref(), &mut app_colors.borders.selected); Self::map_color(b.unselected.as_deref(), &mut app_colors.borders.unselected); diff --git a/src/config/keymap_parser.rs b/src/config/keymap_parser.rs index ee94411..34fde03 100644 --- a/src/config/keymap_parser.rs +++ b/src/config/keymap_parser.rs @@ -326,7 +326,7 @@ impl Keymap { if output.is_empty() { None } else { - // Remove any duplicates for a single deinition + // Remove any duplicates for a single definition if output.first() == output.get(1) { output.pop(); } diff --git a/src/ui/draw_blocks/inspect.rs b/src/ui/draw_blocks/inspect.rs index bb2286e..3c5917d 100644 --- a/src/ui/draw_blocks/inspect.rs +++ b/src/ui/draw_blocks/inspect.rs @@ -439,7 +439,7 @@ mod tests { fn test_draw_blocks_inspect_offset() { let mut setup = test_setup(100, 50, true, true); - // Why does one need to draw first, although it *should* be impossible to scroll before an inital drawing + // Why does one need to draw first, although it *should* be impossible to scroll before an initial drawing setup .terminal .draw(|f| { @@ -495,7 +495,7 @@ mod tests { fn test_draw_blocks_inspect_offset_max() { let mut setup = test_setup(100, 50, true, true); - // Why does one need to draw first, although it *should* be impossible to scroll before an inital drawing + // Why does one need to draw first, although it *should* be impossible to scroll before an initial drawing setup .terminal .draw(|f| { diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap deleted file mode 100644 index d9916e9..0000000 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap +++ /dev/null @@ -1,43 +0,0 @@ ---- -source: src/ui/draw_blocks/help.rs -expression: setup.terminal.backend() ---- -" " -" " -" " -" " -" " -" " -" " -" " -"╭ 0.00.000 ───────────────────────────────────────────────────────────────────────────╮" -"│ 88 │" -"│ 88 │" -"│ ,adPPYba, 8b, ,d8 88 ,d8 ,adPPY │" -"│ a8" "8a `Y8, ,8P' 88 ,a8" a8P____ │" -"│ 8b d8 )888( 8888( 8PP"""" │" -"│ "8a, ,a8" ,d8" "8b, 88`"Yba, "8b, │" -"│ `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd │" -"│ a work in progress, all and any input app │" -"│ A simple tui to view & control docker cont https://github.com/mrjackwills/oxker │" -"│ │" -"│ Keymap │" -"│ q quit c Esc close dialog │" -"│ Down Up j k Home End scrol Left Right scroll horizontally │" -"│ Control incre Enter send docker command │" -"│ e exec i container inspect mode │" -"│ / F1 filte # log search mode │" -"│ h toggl f force clear screen and redraw │" -"│ - = chang \ toggle of section visibility │" -"│ 1 ~ 9 sort 0 stop sort │" -"│ Tab Back Tab chang m toggle mouse capture - allows text selection │" -"│ s save │" -"╰─────────────────────────────────────────────────────────────────────────────────────╯" -" " -" " -" " -" " -" " -" " -" " -" "