Allow verbose output in ct-ng images.

docker/Dockerfile.arm-unknown-linux-gnueabihf

@@ -10,6 +10,7 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+ARG VERBOSE
 COPY crosstool-ng.sh /
 COPY crosstool-config/arm-unknown-linux-gnueabihf.config /
 RUN /crosstool-ng.sh arm-unknown-linux-gnueabihf.config 5

docker/crosstool-ng.sh

@@ -1,11 +1,19 @@
 #!/bin/bash
 
 set -x
-set -euo pipefail
+set -eo pipefail
 
 # shellcheck disable=SC1091
 . lib.sh
 
+silence_stdout() {
+ if [[ "${VERBOSE}" == "1" ]]; then
+ "${@}"
+ else
+ "${@}" >/dev/null
+ fi
+}
+
 main() {
  local config="${1}"
  local nproc="${2}"
@@ -75,14 +83,15 @@ main() {
  # work with any bash functions: must call a command.
  timeout "${timeout}" \
  su "${username}" -c \
- "STOP=${step} CT_DEBUG_CT_SAVE_STEPS=1 ${crosstooldir}/bin/ct-ng build.${nproc} &> /dev/null"
+ "STOP=${step} CT_DEBUG_CT_SAVE_STEPS=1 ${crosstooldir}/bin/ct-ng build.${nproc}"
  }
 
- while download; [ $? -eq 124 ]; do
+ while silence_stdout download; [ $? -eq 124 ]; do
  # Indicates a timeout, repeat the command.
  sleep "${sleep}"
  done
- su "${username}" -c "CT_DEBUG_CT_SAVE_STEPS=1 ${crosstooldir}/bin/ct-ng build.${nproc} &> /dev/null"
+ silence_stdout su "${username}" \
+ -c "CT_DEBUG_CT_SAVE_STEPS=1 ${crosstooldir}/bin/ct-ng build.${nproc}"
 
  popd
 

xtask/src/build_docker_image.rs

@@ -24,8 +24,8 @@ pub struct BuildDockerImage {
  #[clap(long, env = "LABELS")]
  pub labels: Option<String>,
  /// Provide verbose diagnostic output.
- #[clap(short, long)]
- pub verbose: bool,
+ #[clap(short, long, action = clap::ArgAction::Count)]
+ pub verbose: u8,
  /// Do not print cross log messages.
  #[clap(short, long)]
  pub quiet: bool,
@@ -113,7 +113,7 @@ pub fn build_docker_image(
  }: BuildDockerImage,
  engine: &docker::Engine,
 ) -> cross::Result<()> {
- let msg_info = MessageInfo::create(verbose, quiet, color.as_deref())?;
+ let msg_info = MessageInfo::create(verbose != 0, quiet, color.as_deref())?;
  let metadata = cargo_metadata(msg_info)?;
  let version = metadata
  .get_package("cross")
@@ -236,6 +236,9 @@ pub fn build_docker_image(
  for arg in &build_arg {
  docker_build.args(&["--build-arg", arg]);
  }
+ if verbose > 1 {
+ docker_build.args(&["--build-arg", "VERBOSE=1"]);
+ }
 
  docker_build.arg(".");
 

xtask/src/main.rs

@@ -75,7 +75,8 @@ pub fn main() -> cross::Result<()> {
  target_info::target_info(args, &engine)?;
  }
  Commands::BuildDockerImage(args) => {
- let msg_info = MessageInfo::create(args.verbose, args.quiet, args.color.as_deref())?;
+ let msg_info =
+ MessageInfo::create(args.verbose != 0, args.quiet, args.color.as_deref())?;
  let engine = get_container_engine(args.engine.as_deref(), msg_info)?;
  build_docker_image::build_docker_image(args, &engine)?;
  }