JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: docker: fix Dockerfile generation; don't output logs info during Dockerfile build

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-30 13:25:02 +01:00
parent c5de5e0f1f
commit ba7487b1a1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/functions/cli/cli-docker.sh
View File

@@ -19,14 +19,15 @@ function cli_docker_run() {
LOG_SECTION="docker_cli_prepare" do_with_logging docker_cli_prepare
# @TODO: and can be very well said that in CI, we always want FAST_DOCKER=yes, unless we're building the Docker image itself.
if [[ "${FAST_DOCKER:-"no"}" != "yes" ]]; then # "no, I want *slow* docker" -- no one, ever
LOG_SECTION="docker_cli_prepare_dockerfile" do_with_logging docker_cli_prepare_dockerfile
if [[ "${DOCKERFILE_GENERATE_ONLY}" == "yes" ]]; then
display_alert "Dockerfile generated" "exiting" "info"
exit 0
fi
# @TODO: and can be very well said that in CI, we always want FAST_DOCKER=yes, unless we're building the Docker image itself.
if [[ "${FAST_DOCKER:-"no"}" != "yes" ]]; then # "no, I want *slow* docker" -- no one, ever
LOG_SECTION="docker_cli_prepare_dockerfile" do_with_logging docker_cli_prepare_dockerfile
LOG_SECTION="docker_cli_build_dockerfile" do_with_logging docker_cli_build_dockerfile
fi

2
lib/functions/logging/export-logs.sh
View File

@@ -146,7 +146,7 @@ function export_ansi_logs() {
declare target_relative_to_src
target_relative_to_src="$(realpath --relative-to="${SRC}" "${target_file}")"
if [[ "${show_message_after_export:-"yes"}" != "skip" ]]; then
if [[ "${show_message_after_export:-"yes"}" != "skip" && "${ARMBIAN_INSIDE_DOCKERFILE_BUILD:-"no"}" != "yes" ]]; then
display_alert "ANSI log file built; inspect it by running:" "less -RS ${target_relative_to_src}"
display_alert "Share log (beta 2!)" "curl --data-binary @${target_relative_to_src} https://paste.next.armbian.com/log"
# @TODO: compress; have a CLI cmd to upload; also render Markdown logs, etc