chore(ci): make docker build verbose in CI

Let's make CI builds more verbose (controllable by `VERBOSE=1` env var)
nextstrain · May 3, 2023 · 818bc87 · 818bc87
1 parent 9e1d2ab
commit 818bc87
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/bioconda.yml b/.github/workflows/bioconda.yml
@@ -23,6 +23,7 @@ defaults:
 
 env:
   GITHUB_REPOSITORY_URL: ${{ github.server_url }}/${{ github.repository }}
+  VERBOSE: 1
 
 jobs:
 

diff --git a/.github/workflows/builder-docker-image.yml b/.github/workflows/builder-docker-image.yml
@@ -19,6 +19,7 @@ defaults:
 
 env:
   GITHUB_REPOSITORY_URL: ${{ github.server_url }}/${{ github.repository }}
+  VERBOSE: 1
 
 jobs:
   build-base-image:

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -27,6 +27,7 @@ defaults:
 
 env:
   GITHUB_REPOSITORY_URL: ${{ github.server_url }}/${{ github.repository }}
+  VERBOSE: 1
 
 jobs:
 

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -27,6 +27,7 @@ defaults:
 
 env:
   GITHUB_REPOSITORY_URL: ${{ github.server_url }}/${{ github.repository }}
+  VERBOSE: 1
 
 jobs:
   build-web:

diff --git a/docker-dev b/docker-dev
@@ -400,7 +400,11 @@ if ! docker inspect --format '{{.Id}}' "${DOCKER_REPO}:${DOCKER_TARGET}-${DOCKER
   CACHE_SCOPE="${DOCKER_REPO}-${DOCKER_TARGET}-${BRANCH}"
   BUILDX_CACHE_DIR="${CACHE_DIR}/buildx"
 
-  ${NICE} docker buildx build -q \
+  if [ "${VERBOSE:=0}" != "1" ]; then
+    ADDITIONAL_DOCKER_BUILD_ARGS="${ADDITIONAL_DOCKER_BUILD_ARGS} -q"
+  fi
+
+  ${NICE} docker buildx build \
     --file="docker/docker-dev.dockerfile" \
     --target="${DOCKER_TARGET}" \
     --tag="${DOCKER_REPO}:${DOCKER_TARGET}" \