Allow verbose output in ct-ng images.

cross-rs · Jul 4, 2022 · 330aa7e · 330aa7e
1 parent 4c091de
commit 330aa7e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/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

diff --git a/docker/crosstool-ng.sh b/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
 

diff --git a/xtask/src/build_docker_image.rs b/xtask/src/build_docker_image.rs
@@ -236,6 +236,9 @@ pub fn build_docker_image(
  for arg in &build_arg {
  docker_build.args(&["--build-arg", arg]);
  }
+ if let Ok(env_verbose) = std::env::var("VERBOSE") {
+ docker_build.args(&["--build-arg", &format!("VERBOSE={env_verbose}")]);
+ }
 
  docker_build.arg(".");