niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge release-v0.3.1 into main

Browse Source
This commit is contained in:
Jack Wills
2023-06-04 00:40:40 +00:00
parent 46fa47b896 ef39082276
commit afc51c3a26
9 changed files with 281 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-body.md
+6 -16
View File
@@ -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 <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
.github/workflows/create_release_and_build.yml
+7 -8
View File
@@ -5,8 +5,7 @@ on:
- 'v[0-9]+.[0-9]+.[0-9]+'
jobs:
deploy:
# Change this to latest - or ubuntu 20.04?
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -36,13 +35,12 @@ jobs:
- name: install cross
run: cargo install cross --git https://github.com/cross-rs/cross
# Build for linux x86_64
# Should this actually build for musl?
- name: build release linux_x86_64
run: cargo build --release
# Build for linux x86 musl
- name: build x86_64-unknown-linux-musl
run: cross build --target x86_64-unknown-linux-musl --release
# Compress output into tar
- name: compress oxker_linux_x86_64 binary
run: tar -C target/release -czf ./oxker_linux_x86_64.tar.gz oxker
- name: compress aarch64 binary
run: tar -C target/x86_64-unknown-linux-musl/release -czf ./oxker_linux_x86_64.tar.gz oxker
# Build for linux aarch64, aka 64 bit pi 4
- name: build aarch64-unknown-linux-musl
@@ -98,6 +96,7 @@ jobs:
-t ${{ secrets.DOCKERHUB_USERNAME }}/oxker:${{env.CURRENT_SEMVER}} \
-t ghcr.io/${{ github.repository_owner }}/oxker:latest \
-t ghcr.io/${{ github.repository_owner }}/oxker:${{env.CURRENT_SEMVER}} \
--provenance=false --sbom=false \
--push \
-f containerised/Dockerfile .
CHANGELOG.md
+12
View File
@@ -1,3 +1,15 @@
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.3.1'>v0.3.1</a>
### 2023-06-04
### Chores
+ 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](https://github.com/mrjackwills/oxker/issues/29), [47cda44b](https://github.com/mrjackwills/oxker/commit/47cda44b8213cfb8c3807df6c43e3f5dc2452b57)
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.3.0'>v0.3.0</a>
### 2023-03-30
Cargo.lock
Generated
+185 -282
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "oxker"
version = "0.3.0"
version = "0.3.1"
edition = "2021"
authors = ["Jack Wills <email@mrjackwills.com>"]
description = "A simple tui to view & control docker containers"
@@ -15,14 +15,14 @@ categories = ["command-line-utilities"]
anyhow = "1.0"
bollard = "0.14"
cansi = "2.2"
clap={version="4.2", features = ["derive", "unicode", "color"] }
clap={version="4.3", features = ["derive", "unicode", "color"] }
crossterm = "0.26"
futures-util = "0.3"
parking_lot = {version= "0.12"}
tokio = {version = "1.27", features=["full"]}
tokio = {version = "1.28", features=["full"]}
tracing = "0.1"
tracing-subscriber = "0.3"
ratatui = "0.20"
ratatui = "0.21"
uuid = {version = "1.3", features = ["v4", "fast-rng"]}
[dev-dependencies]
create_release.sh
+13 -2
View File
@@ -176,26 +176,37 @@ cargo_test () {
# This will download GB's of docker images
cargo_build () {
cargo install cross
echo -e "${YELLOW}cargo build --release${RESET}"
cargo build --release
cargo_clean
echo -e "${YELLOW}cross build --target x86_64-unknown-linux-musl --release${RESET}"
cross build --target x86_64-unknown-linux-musl --release
ask_continue
cargo_clean
echo -e "${YELLOW}cross build --target aarch64-unknown-linux-musl --release${RESET}"
cross build --target aarch64-unknown-linux-musl --release
ask_continue
cargo_clean
echo -e "${YELLOW}cross build --target arm-unknown-linux-musleabihf --release${RESET}"
cross build --target arm-unknown-linux-musleabihf --release
ask_continue
cargo_clean
echo -e "${YELLOW}cross build --target x86_64-pc-windows-gnu --release${RESET}"
cross build --target x86_64-pc-windows-gnu --release
ask_continue
cargo_clean
}
# $1 text to colourise
release_continue () {
echo -e "\n${PURPLE}$1${RESET}"
ask_continue
}
# Clean/remove builds, due to issue with cross-rs
cargo_clean() {
echo -e "${YELLOW}cargo clean${RESET}"
cargo clean
}
# Check repository for typos
check_typos () {
echo -e "\n${PURPLE}check typos${RESET}"
src/ui/color_match.rs
+9 -9
View File
@@ -3,12 +3,12 @@ pub mod log_sanitizer {
use cansi::{v3::categorise_text, Color as CansiColor, Intensity};
use ratatui::{
style::{Color, Modifier, Style},
text::{Span, Spans},
text::{Line, Span},
};
/// Attempt to colorize the given string to tui-rs standards
pub fn colorize_logs<'a>(input: &str) -> Vec<Spans<'a>> {
vec![Spans::from(
/// Attempt to colorize the given string to ratatui standards
pub fn colorize_logs<'a>(input: &str) -> Vec<Line<'a>> {
vec![Line::from(
categorise_text(input)
.iter()
.map(|i| {
@@ -39,17 +39,17 @@ pub mod log_sanitizer {
)]
}
/// Remove all ansi formatting from a given string and create tui-rs spans
pub fn remove_ansi<'a>(input: &str) -> Vec<Spans<'a>> {
/// Remove all ansi formatting from a given string and create ratatui Lines
pub fn remove_ansi<'a>(input: &str) -> Vec<Line<'a>> {
raw(&categorise_text(input)
.into_iter()
.map(|i| i.text)
.collect::<String>())
}
/// create tui-rs spans that exactly match the given strings
pub fn raw<'a>(input: &str) -> Vec<Spans<'a>> {
vec![Spans::from(Span::raw(input.to_owned()))]
/// create ratatui Lines that exactly match the given strings
pub fn raw<'a>(input: &str) -> Vec<Line<'a>> {
vec![Line::from(Span::raw(input.to_owned()))]
}
/// Change from ansi to tui colors
src/ui/draw_blocks.rs
+44 -44
View File
@@ -4,7 +4,7 @@ use ratatui::{
layout::{Alignment, Constraint, Direction, Layout, Rect},
style::{Color, Modifier, Style},
symbols,
text::{Span, Spans},
text::{Line, Span},
widgets::{
Axis, Block, BorderType, Borders, Chart, Clear, Dataset, GraphType, List, ListItem,
Paragraph,
@@ -96,7 +96,7 @@ pub fn commands<B: Backend>(
let items = app_data.lock().get_control_items().map_or(vec![], |i| {
i.iter()
.map(|c| {
let lines = Spans::from(vec![Span::styled(
let lines = Line::from(vec![Span::styled(
c.to_string(),
Style::default().fg(c.get_color()),
)]);
@@ -138,7 +138,7 @@ pub fn containers<B: Backend>(
let state_style = Style::default().fg(i.state.get_color());
let blue = Style::default().fg(Color::Blue);
let lines = Spans::from(vec![
let lines = Line::from(vec![
Span::styled(
format!(
"{:<width$}",
@@ -489,25 +489,25 @@ pub fn heading_bar<B: Backend>(
/// Help popup box needs these three pieces of information
struct HelpInfo {
spans: Vec<Spans<'static>>,
lines: Vec<Line<'static>>,
width: usize,
height: usize,
}
impl HelpInfo {
/// Find the max width of a Span in &[Spans], although it isn't calculating it correctly
fn calc_width(spans: &[Spans]) -> usize {
spans
/// Find the max width of a Span in &[Line], although it isn't calculating it correctly
fn calc_width(lines: &[Line]) -> usize {
lines
.iter()
.flat_map(|x| x.0.iter())
.flat_map(|x| x.spans.iter())
.map(ratatui::text::Span::width)
.max()
.unwrap_or(1)
}
/// Just an empty span, i.e. a new line
fn empty_span<'a>() -> Spans<'a> {
Spans::from(String::new())
fn empty_span<'a>() -> Line<'a> {
Line::from(String::new())
}
/// generate a span, of given &str and given color
@@ -527,15 +527,15 @@ impl HelpInfo {
/// Generate the `oxker` name span + metadata
fn gen_name() -> Self {
let mut spans = NAME_TEXT
let mut lines = NAME_TEXT
.lines()
.map(|i| Spans::from(Self::white_span(i)))
.map(|i| Line::from(Self::white_span(i)))
.collect::<Vec<_>>();
spans.insert(0, Self::empty_span());
let width = Self::calc_width(&spans);
let height = spans.len();
lines.insert(0, Self::empty_span());
let width = Self::calc_width(&lines);
let height = lines.len();
Self {
spans,
lines,
width,
height,
}
@@ -543,15 +543,15 @@ impl HelpInfo {
/// Generate the description span + metadata
fn gen_description() -> Self {
let spans = [
let lines = [
Self::empty_span(),
Spans::from(Self::white_span(DESCRIPTION)),
Line::from(Self::white_span(DESCRIPTION)),
Self::empty_span(),
];
let width = Self::calc_width(&spans);
let height = spans.len();
let width = Self::calc_width(&lines);
let height = lines.len();
Self {
spans: spans.to_vec(),
lines: lines.to_vec(),
width,
height,
}
@@ -564,15 +564,15 @@ impl HelpInfo {
let or = || button_desc("or");
let space = || button_desc(" ");
let spans = [
Spans::from(vec![
let lines = [
Line::from(vec![
space(),
button_item("tab"),
or(),
button_item("shift+tab"),
button_desc("to change panels"),
]),
Spans::from(vec![
Line::from(vec![
space(),
button_item("↑ ↓"),
or(),
@@ -583,40 +583,40 @@ impl HelpInfo {
button_item("Home End"),
button_desc("to change selected line"),
]),
Spans::from(vec![
Line::from(vec![
space(),
button_item("enter"),
button_desc("to send docker container command"),
]),
Spans::from(vec![
Line::from(vec![
space(),
button_item("h"),
button_desc("to toggle this help information"),
]),
Spans::from(vec![space(), button_item("0"), button_desc("to stop sort")]),
Spans::from(vec![
Line::from(vec![space(), button_item("0"), button_desc("to stop sort")]),
Line::from(vec![
space(),
button_item("1 - 9"),
button_desc("sort by header - or click header"),
]),
Spans::from(vec![
Line::from(vec![
space(),
button_item("m"),
button_desc(
"to toggle mouse capture - if disabled, text on screen can be selected & copied",
),
]),
Spans::from(vec![
Line::from(vec![
space(),
button_item("q"),
button_desc("to quit at any time"),
]),
];
let height = spans.len();
let width = Self::calc_width(&spans);
let height = lines.len();
let width = Self::calc_width(&lines);
Self {
spans: spans.to_vec(),
lines: lines.to_vec(),
width,
height,
}
@@ -624,22 +624,22 @@ impl HelpInfo {
/// Generate the final lines, GitHub link etc, + metadata
fn gen_final() -> Self {
let spans = [
let lines = [
Self::empty_span(),
Spans::from(vec![Self::black_span(
Line::from(vec![Self::black_span(
"currently an early work in progress, all and any input appreciated",
)]),
Spans::from(vec![Span::styled(
Line::from(vec![Span::styled(
REPO.to_owned(),
Style::default()
.fg(Color::White)
.add_modifier(Modifier::UNDERLINED),
)]),
];
let height = spans.len();
let width = Self::calc_width(&spans);
let height = lines.len();
let width = Self::calc_width(&lines);
Self {
spans: spans.to_vec(),
lines: lines.to_vec(),
width,
height,
}
@@ -689,22 +689,22 @@ pub fn help_box<B: Backend>(f: &mut Frame<'_, B>) {
)
.split(area);
let name_paragraph = Paragraph::new(name_info.spans)
let name_paragraph = Paragraph::new(name_info.lines)
.style(Style::default().bg(Color::Magenta).fg(Color::White))
.block(Block::default())
.alignment(Alignment::Center);
let description_paragraph = Paragraph::new(description_info.spans)
let description_paragraph = Paragraph::new(description_info.lines)
.style(Style::default().bg(Color::Magenta).fg(Color::Black))
.block(Block::default())
.alignment(Alignment::Center);
let help_paragraph = Paragraph::new(button_info.spans)
let help_paragraph = Paragraph::new(button_info.lines)
.style(Style::default().bg(Color::Magenta).fg(Color::Black))
.block(Block::default())
.alignment(Alignment::Left);
let final_paragraph = Paragraph::new(final_info.spans)
let final_paragraph = Paragraph::new(final_info.lines)
.style(Style::default().bg(Color::Magenta).fg(Color::Black))
.block(Block::default())
.alignment(Alignment::Center);
@@ -738,7 +738,7 @@ pub fn delete_confirm<B: Backend>(
.title_alignment(Alignment::Center)
.borders(Borders::ALL);
let confirm = Spans::from(vec![
let confirm = Line::from(vec![
Span::from("Are you sure you want to delete container: "),
Span::styled(
name,
src/ui/mod.rs
+1 -2
View File
@@ -278,8 +278,7 @@ fn draw_frame<B: Backend>(
);
if let Some(id) = delete_confirm {
let name = app_data.lock().get_container_name_by_id(&id);
name.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