do not show the docker commands by default

Takashi Matsuo · Takashi Matsuo · commit 89efc9fd7d67 · 2020-05-28T22:43:48.000Z
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -230,6 +230,9 @@ if [[ "${TRAMPOLINE_IMAGE_SOURCE:-none}" != "none" ]]; then
     fi
 
     log_yellow "Start building the docker image."
+    if [[ "${TRAMPOLINE_SHOW_COMMAND:-false}" == "true" ]]; then
+	echo "docker build" "${docker_build_flags[@]}" "${context_dir}"
+    fi
     if docker build "${docker_build_flags[@]}" "${context_dir}"; then
 	log_green "Finished building the docker image."
 	update_cache="true"
@@ -306,14 +309,18 @@ done
 if [[ $# -ge 1 ]]; then
     log_yellow "Running the given commands '" "${@:1}" "' in the container."
     readonly commands=("${@:1}")
-    echo docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" "${commands[@]}"
+    if [[ "${TRAMPOLINE_SHOW_COMMAND:-false}" == "true" ]]; then
+	echo docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" "${commands[@]}"
+    fi
     docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}" "${commands[@]}"
 else
     log_yellow "Running the tests in a Docker container."
     # Temporary workaround to remove unnecessary prefix.
     real_build_file=${TRAMPOLINE_BUILD_FILE#"github/python-docs-samples/"}
     docker_flags+=("--entrypoint=${real_build_file}")
-    echo docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}"
+    if [[ "${TRAMPOLINE_SHOW_COMMAND:-false}" == "true" ]]; then
+	echo docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}"
+    fi
     docker run "${docker_flags[@]}" "${TRAMPOLINE_IMAGE}"
 fi
 
diff --git a/.trampolinerc b/.trampolinerc
@@ -60,3 +60,9 @@ fi
 if [[ -z "${TRAMPOLINE_IMAGE_UPLOAD:-}" ]]; then
     TRAMPOLINE_IMAGE_UPLOAD="false"
 fi
+
+if [[ -z "${TRAMPOLINE_SHOW_COMMAND:-}" ]]; then
+    # We are sure there's no secrets in the command line in docker
+    # bulid and docker run commands.
+    TRAMPOLINE_SHOW_COMMAND="true"
+fi
