Skip to content

Commit 757f50a

Browse files
committed
wDAfdwafwafwa
1 parent 984e893 commit 757f50a

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
run: cargo test --target=x86_64-unknown-linux-musl --verbose -- --show-output
2626
# container tests cannot run in parallel
2727
- name: Run container tests
28-
run: cargo test --target=x86_64-unknown-linux-musl --verbose -- --ignored --show-output --test-threads 1
28+
run: cargo test --target=x86_64-unknown-linux-musl --verbose -- --ignored --show-output
2929
- name: Run clippy
3030
run: cargo clippy --verbose

src/commands/cmd_start.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use crate::cli::{CmdStartArgs, ConfigArg};
44
use crate::command_extensions::*;
55
use crate::prelude::*;
66
use crate::{APP_NAME, ENV_VAR_PREFIX, VERSION};
7+
use std::io::IsTerminal;
78
use std::path::PathBuf;
89
use util::*;
910

@@ -306,7 +307,9 @@ pub fn start_container(ctx: Context, mut cli_args: CmdStartArgs) -> Result<()> {
306307

307308
// pull image interactively if it does not exist
308309
if !ctx.engine.image_exists(&container_image)? && !ctx.dry_run {
309-
ctx.engine.image_pull(&container_image, true)?;
310+
// pull interactively only if running in terminal
311+
ctx.engine
312+
.image_pull(&container_image, std::io::stdout().is_terminal())?;
310313
}
311314

312315
if ctx.dry_run {

0 commit comments

Comments
 (0)