From d8254d1e6e859feea8e22dbe45ec9ed7f93b9a64 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 15 Jan 2023 22:30:49 +0100 Subject: [PATCH] armbian-next: `docker`: fix Dockerfile output indentation & warning msgs about generation --- lib/functions/host/docker.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh index c6b62dd5a2..b617affeb3 100755 --- a/lib/functions/host/docker.sh +++ b/lib/functions/host/docker.sh @@ -236,19 +236,20 @@ function docker_cli_prepare() { c="## " # Add comment to simulate clean env fi cat <<- INITIAL_DOCKERFILE > "${SRC}"/Dockerfile + ${c}# PLEASE DO NOT MODIFY THIS FILE. IT IS AUTOGENERATED AND WILL BE OVERWRITTEN. Please don't build this Dockerfile yourself either. Use Armbian ./compile.sh instead. FROM ${DOCKER_ARMBIAN_BASE_IMAGE} - ${c} # PLEASE DO NOT MODIFY THIS FILE. IT IS AUTOGENERATED AND WILL BE OVERWRITTEN. Please don't build this Dockerfile yourself either. Use Armbian helpers instead. - ${c} RUN echo "--> CACHE MISS IN DOCKERFILE: apt packages." && \ - ${c} DEBIAN_FRONTEND=noninteractive apt-get -y update && \ - ${c} DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ${BASIC_DEPS[@]} ${host_dependencies[@]} - ${c} RUN sed -i 's/# en_US.UTF-8/en_US.UTF-8/' /etc/locale.gen - ${c} RUN locale-gen + ${c}# PLEASE DO NOT MODIFY THIS FILE. IT IS AUTOGENERATED AND WILL BE OVERWRITTEN. Please don't build this Dockerfile yourself either. Use Armbian ./compile.sh instead. + ${c}RUN echo "--> CACHE MISS IN DOCKERFILE: apt packages." && \\ + ${c} DEBIAN_FRONTEND=noninteractive apt-get -y update && \\ + ${c} DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ${BASIC_DEPS[@]} ${host_dependencies[@]} + ${c}RUN sed -i 's/# en_US.UTF-8/en_US.UTF-8/' /etc/locale.gen + ${c}RUN locale-gen WORKDIR ${DOCKER_ARMBIAN_TARGET_PATH} ENV ARMBIAN_RUNNING_IN_CONTAINER=yes ADD . ${DOCKER_ARMBIAN_TARGET_PATH}/ - ${c} RUN echo "--> CACHE MISS IN DOCKERFILE: running Armbian requirements initialization." && \ - ${c} /bin/bash "${DOCKER_ARMBIAN_TARGET_PATH}/compile.sh" requirements SHOW_LOG=yes && \ - ${c} rm -rf "${DOCKER_ARMBIAN_TARGET_PATH}/output" "${DOCKER_ARMBIAN_TARGET_PATH}/.tmp" "${DOCKER_ARMBIAN_TARGET_PATH}/cache" + ${c}RUN echo "--> CACHE MISS IN DOCKERFILE: running Armbian requirements initialization." && \\ + ${c} /bin/bash "${DOCKER_ARMBIAN_TARGET_PATH}/compile.sh" requirements SHOW_LOG=yes && \\ + ${c} rm -rf "${DOCKER_ARMBIAN_TARGET_PATH}/output" "${DOCKER_ARMBIAN_TARGET_PATH}/.tmp" "${DOCKER_ARMBIAN_TARGET_PATH}/cache" INITIAL_DOCKERFILE }