Skip to content

Commit

Permalink
remove the --progress flag as it is no longer available in newer vers…
Browse files Browse the repository at this point in the history
…ions of Docker
  • Loading branch information
chanderlud committed Jan 19, 2024
1 parent e2e643f commit 04b1003
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
13 changes: 0 additions & 13 deletions src/docker/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::env;
use std::process::Command;
use std::str::FromStr;

Expand Down Expand Up @@ -38,7 +37,6 @@ impl From<Progress> for &str {

pub trait BuildCommandExt {
fn invoke_build_command(&mut self) -> &mut Self;
fn progress(&mut self, progress: Option<Progress>) -> Result<&mut Self>;
fn verbose(&mut self, verbosity: Verbosity) -> &mut Self;
fn disable_scan_suggest(&mut self) -> &mut Self;
fn cross_labels(&mut self, target: &str, platform: &str) -> &mut Self;
Expand All @@ -52,17 +50,6 @@ impl BuildCommandExt for Command {
}
}

fn progress(&mut self, progress: Option<Progress>) -> Result<&mut Self> {
let progress: Progress = match progress {
None => env::var("CROSS_BUILD_PROGRESS")
.as_deref()
.unwrap_or("auto")
.parse()?,
Some(progress) => progress,
};
Ok(self.args(["--progress", progress.into()]))
}

fn verbose(&mut self, verbosity: Verbosity) -> &mut Self {
match verbosity {
Verbosity::Verbose(2..) => self.args(["--build-arg", "VERBOSE=1"]),
Expand Down
1 change: 0 additions & 1 deletion src/docker/custom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ impl<'a> Dockerfile<'a> {
self.runs_with()
.specify_platform(&options.engine, &mut docker_build);

docker_build.progress(None)?;
docker_build.verbose(msg_info.verbosity);
docker_build.cross_labels(options.target.triple(), self.runs_with().target.triple());

Expand Down

0 comments on commit 04b1003

Please sign in to comment.