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

feat: set rust-version in Cargo.toml, closes #77

Browse Source 
Update zigbuild docker run command to download latest rust version
This commit is contained in:
Jack Wills
2025-12-09 11:10:19 +00:00
parent 65d7970033
commit 0763a1024f
13 changed files with 50 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/create_release_and_build.yml
+10 -2
View File
@@ -47,11 +47,19 @@ jobs:
- name: install cross
run: cargo install cross --git https://github.com/cross-rs/cross
# Build binary for arm MacOS using Docker Zigbuild
- name: build
if: matrix.target == 'aarch64-apple-darwin'
run: |
docker run --rm -v $(pwd):/io -w /io ghcr.io/rust-cross/cargo-zigbuild cargo zigbuild --release --target aarch64-apple-darwin
docker run --rm \
-v "$(pwd):/io" \
-w /io \
ghcr.io/rust-cross/cargo-zigbuild \
bash -ec '
rustup update stable
rustup default stable
rustup target add aarch64-apple-darwin
cargo zigbuild --release --target aarch64-apple-darwin
'
# Build all other targets using Cross
- name: build
Cargo.toml
+1 -2
View File
@@ -7,8 +7,7 @@ description = "A simple tui to view & control docker containers"
repository = "https://github.com/mrjackwills/oxker"
homepage = "https://github.com/mrjackwills/oxker"
license = "MIT"
# This is stuck to whatever version cargo-zigbuild is using - https://github.com/rust-cross/cargo-zigbuild/blob/main/Dockerfile
rust-version = "1.87.0"
rust-version = "1.90.0"
readme = "README.md"
keywords = ["docker", "tui", "tokio", "terminal", "podman"]
categories = ["command-line-utilities"]
create_release.sh
+6 -2
View File
@@ -232,8 +232,12 @@ cross_build_x86_windows() {
# Build, using zig-build, for Apple silicon
zig_build_aarch64_apple() {
# mkdir /workspace/oxker/target
echo -e "${YELLOW}docker run --rm -v $(pwd):/io -w /io ghcr.io/rust-cross/cargo-zigbuild cargo zigbuild --release --target aarch64-apple-darwin${RESET}"
docker run --rm -v "$(pwd):/io" -w /io ghcr.io/rust-cross/cargo-zigbuild cargo zigbuild --release --target aarch64-apple-darwin
echo -e "${YELLOW}docker run --rm -v $(pwd):/io -w /io ghcr.io/rust-cross/cargo-zigbuild bash -e -c 'rustup update stable && rustup default stable && rustup target add aarch64-apple-darwin && cargo zigbuild --release --target aarch64-apple-darwin${RESET}"
docker run --rm -v "$(pwd):/io" -w /io \
ghcr.io/rust-cross/cargo-zigbuild \
bash -ec 'rustup update stable && rustup default stable && rustup target add aarch64-apple-darwin && cargo zigbuild --release --target aarch64-apple-darwin'
if ask_yn "sudo chown $(pwd)/target"; then
echo -e "${YELLOW}sudo chown -R vscode:vscode $(pwd)/target${RESET}"
sudo chown -R vscode:vscode "$(pwd)/target"
src/app_data/container_state.rs
+4 -6
View File
@@ -689,12 +689,11 @@ impl Logs {
if let Some(new_index) = match sd {
ScrollDirection::Next => current_position.checked_add(1),
ScrollDirection::Previous => current_position.checked_sub(1),
} {
if let Some(f) = self.search_results.get(new_index) {
}
&& let Some(f) = self.search_results.get(new_index) {
self.lines.state.select(Some(*f));
return Some(());
}
}
} else {
let range = match sd {
ScrollDirection::Previous => (0..=current_selected).rev().collect::<Vec<_>>(),
@@ -922,12 +921,11 @@ impl Logs {
/// Add a padding so one char will always be visilbe?
pub fn forward(&mut self, width: u16) {
let offset = usize::from(self.offset);
if self.horizontal_scroll_able(width) {
if self.adjusted_max_width > 0 && offset < self.adjusted_max_width {
if self.horizontal_scroll_able(width)
&& self.adjusted_max_width > 0 && offset < self.adjusted_max_width {
self.offset = self.offset.saturating_add(1);
}
}
}
/// Reduce the char offset
pub const fn back(&mut self) {
src/app_data/mod.rs
+4 -6
View File
@@ -172,12 +172,11 @@ impl AppData {
}
pub fn log_search_scroll(&mut self, np: &ScrollDirection) {
if let Some(i) = self.get_mut_selected_container() {
if i.logs.search_scroll(np).is_some() {
if let Some(i) = self.get_mut_selected_container()
&& i.logs.search_scroll(np).is_some() {
self.rerender.update_draw();
}
}
}
pub fn gen_log_search(&self) -> Option<LogSearch> {
self.get_selected_container()
@@ -340,14 +339,13 @@ impl AppData {
/// Sort containers based on a given header, if headings match, and already ascending, remove sorting
pub fn set_sort_by_header(&mut self, selected_header: Header) {
let mut output = Some((selected_header, SortedOrder::Asc));
if let Some((current_header, order)) = self.get_sorted() {
if current_header == selected_header {
if let Some((current_header, order)) = self.get_sorted()
&& current_header == selected_header {
match order {
SortedOrder::Desc => output = None,
SortedOrder::Asc => output = Some((selected_header, SortedOrder::Desc)),
}
}
}
self.set_sorted(output);
}
src/config/keymap_parser.rs
+4 -6
View File
@@ -158,8 +158,8 @@ impl From<Option<ConfigKeymap>> for Keymap {
|vec_str: Option<Vec<String>>,
keymap_field: &mut (KeyCode, Option<KeyCode>),
keymap_clash: &mut HashSet<KeyCode>| {
if let Some(vec_str) = vec_str {
if let Some(vec_keycode) = Self::try_parse_keycode(&vec_str) {
if let Some(vec_str) = vec_str
&& let Some(vec_keycode) = Self::try_parse_keycode(&vec_str) {
if let Some(first) = vec_keycode.first() {
keymap_clash.insert(*first);
counter += 1;
@@ -173,7 +173,6 @@ impl From<Option<ConfigKeymap>> for Keymap {
keymap_field.1 = None;
}
}
}
};
if let Some(ck) = value {
@@ -276,8 +275,8 @@ impl Keymap {
for key in input.iter().take(2) {
if key.chars().count() == 1 {
if let Some(first_char) = key.chars().next() {
if let Some(first_char) = match first_char {
if let Some(first_char) = key.chars().next()
&& let Some(first_char) = match first_char {
x if x.is_ascii_alphabetic() || x.is_ascii_digit() => Some(first_char),
'/' | '\\' | ',' | '.' | '#' | '\'' | '[' | ']' | ';' | '=' | '-' => {
Some(first_char)
@@ -286,7 +285,6 @@ impl Keymap {
} {
output.push(KeyCode::Char(first_char));
}
}
} else {
let keycode = match key.to_lowercase().as_str() {
"f1" => Some(KeyCode::F(1)),
src/config/mod.rs
+2 -3
View File
@@ -211,13 +211,12 @@ impl Config {
let args = Args::parse();
let config_from_cli = Self::from(&args);
if let Some(config_file) = &args.config_file {
if let Some(config_file) =
if let Some(config_file) = &args.config_file
&& let Some(config_file) =
parse_config_file::ConfigFile::try_parse_from_file(config_file)
{
return Self::from(config_file).merge_args(config_from_cli);
}
}
if let Some(config_file) = parse_config_file::ConfigFile::try_parse(in_container) {
return Self::from(config_file).merge_args(config_from_cli);
src/exec.rs
+9 -19
View File
@@ -161,15 +161,15 @@ impl ExecMode {
let use_cli = app_data.lock().config.use_cli;
let container = app_data.lock().get_selected_container_id_state_name();
if let Some((id, state, _)) = container {
if [
if let Some((id, state, _)) = container
&& [
State::Running(RunningState::Healthy),
State::Running(RunningState::Unhealthy),
]
.contains(&state)
{
if tty_readable() && !use_cli {
if let Ok(exec) = docker
if tty_readable() && !use_cli
&& let Ok(exec) = docker
.create_exec(
id.get(),
CreateExecOptions {
@@ -180,34 +180,24 @@ impl ExecMode {
},
)
.await
{
if let Ok(StartExecResults::Attached { mut output, .. }) =
&& let Ok(StartExecResults::Attached { mut output, .. }) =
docker.start_exec(&exec.id, None).await
{
if let Some(Ok(msg)) = output.next().await {
if !msg.to_string().starts_with(OCI_ERROR) {
&& let Some(Ok(msg)) = output.next().await
&& !msg.to_string().starts_with(OCI_ERROR) {
return Some(Self::Internal((
Arc::new(id),
Arc::clone(docker),
)));
}
}
}
}
}
if let Ok(output) = std::process::Command::new(command::DOCKER)
.args([command::EXEC, id.get(), command::PWD])
.output()
{
if let Ok(output) = String::from_utf8(output.stdout) {
if !output.starts_with(OCI_ERROR) {
&& let Ok(output) = String::from_utf8(output.stdout)
&& !output.starts_with(OCI_ERROR) {
return Some(Self::External(Arc::new(id)));
}
}
}
}
}
None
}
src/input_handler/mod.rs
+2 -3
View File
@@ -178,8 +178,8 @@ impl InputHandler {
async fn save_logs(&self) -> Result<(), Box<dyn std::error::Error>> {
let args = self.app_data.lock().config.clone();
let container = self.app_data.lock().get_selected_container_id_state_name();
if let Some((id, _, name)) = container {
if let Some(log_path) = args.save_dir {
if let Some((id, _, name)) = container
&& let Some(log_path) = args.save_dir {
let (sx, rx) = tokio::sync::oneshot::channel();
self.docker_tx.send(DockerMessage::Exec(sx)).await?;
@@ -230,7 +230,6 @@ impl InputHandler {
.set_info_box(&format!("saved to {}", path.display()));
}
}
}
Ok(())
}
src/main.rs
+2 -4
View File
@@ -1,4 +1,3 @@
#![allow(clippy::collapsible_if)]
// #![allow(unused)]
// Zigbuild is stuck on 1.87.0, which means Mac builds won't work when using collapsible ifs
@@ -64,8 +63,8 @@ async fn docker_init(
Docker::connect_with_socket(&host, 120, API_DEFAULT_VERSION)
});
if let Ok(docker) = connection {
if docker.ping().await.is_ok() {
if let Ok(docker) = connection
&& docker.ping().await.is_ok() {
tokio::spawn(DockerData::start(
Arc::clone(app_data),
docker,
@@ -75,7 +74,6 @@ async fn docker_init(
));
return;
}
}
app_data
.lock()
.set_error(AppError::DockerConnect, gui_state, Status::DockerConnect);
src/ui/draw_blocks/headers.rs
+2 -3
View File
@@ -39,15 +39,14 @@ fn gen_header<'a>(
fn gen_header_block<'a>(colors: AppColors, fd: &FrameData, header: Header) -> (Color, &'a str) {
let mut color = colors.headers_bar.text;
let mut suffix = "";
if let Some((a, b)) = &fd.sorted_by {
if &header == a {
if let Some((a, b)) = &fd.sorted_by
&& &header == a {
match b {
SortedOrder::Asc => suffix = " ▲",
SortedOrder::Desc => suffix = " ▼",
}
color = colors.headers_bar.text_selected;
}
}
(color, suffix)
}
src/ui/draw_blocks/mod.rs
+2 -3
View File
@@ -103,13 +103,12 @@ fn generate_block<'a>(
.border_type(BorderType::Rounded)
.title(ratatui::text::Line::from(title).left_aligned());
if panel == SelectablePanel::Logs {
if let Some(x) = fd.scroll_title.as_ref() {
if panel == SelectablePanel::Logs
&& let Some(x) = fd.scroll_title.as_ref() {
block = block
.title_bottom(x.to_owned())
.title_alignment(ratatui::layout::Alignment::Right);
}
}
if !fd.status.contains(&Status::Filter) {
if fd.selected_panel == panel {
block = block.border_style(Style::default().fg(colors.borders.selected));
src/ui/mod.rs
+2 -3
View File
@@ -237,8 +237,8 @@ impl Ui {
}
}
if crossterm::event::poll(POLL_RATE).unwrap_or(false) {
if let Ok(event) = event::read() {
if crossterm::event::poll(POLL_RATE).unwrap_or(false)
&& let Ok(event) = event::read() {
if let Event::Key(key) = event {
if key.kind == event::KeyEventKind::Press {
self.input_tx
@@ -264,7 +264,6 @@ impl Ui {
self.gui_state.lock().set_screen_width(width);
}
}
}
self.check_clear();
}
Ok(())