From e799ef43fa73f2908ea14c8fe006a0b8b1b8ad40 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 09:56:25 +0800
Subject: [PATCH] [Tool] dockerfile enhancement (backport #30736) (#30793)

Co-authored-by: Kevin Cai <caixiaohua@starrocks.com>
---
 docker/dockerfiles/allin1/allin1-ubi.Dockerfile    | 3 ++-
 docker/dockerfiles/allin1/allin1-ubuntu.Dockerfile | 3 ++-
 docker/dockerfiles/be/be_entrypoint.sh             | 9 +++++++++
 docker/dockerfiles/be/cn_entrypoint.sh             | 9 +++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docker/dockerfiles/allin1/allin1-ubi.Dockerfile b/docker/dockerfiles/allin1/allin1-ubi.Dockerfile
index 33d728e40ecf91..a854f0443f01e5 100644
--- a/docker/dockerfiles/allin1/allin1-ubi.Dockerfile
+++ b/docker/dockerfiles/allin1/allin1-ubi.Dockerfile
@@ -50,6 +50,7 @@ COPY docker/dockerfiles/allin1/*.sh docker/dockerfiles/allin1/*.conf docker/dock
 COPY docker/dockerfiles/allin1/services/ $SR_HOME
 RUN cat be.conf >> $DEPLOYDIR/starrocks/be/conf/be.conf && \
     cat fe.conf >> $DEPLOYDIR/starrocks/fe/conf/fe.conf && \
-    mkdir -p $DEPLOYDIR/starrocks/fe/meta && mkdir -p $DEPLOYDIR/starrocks/be/storage && touch /.dockerenv
+    rm -f be.conf fe.conf && \
+    mkdir -p $DEPLOYDIR/starrocks/fe/meta $DEPLOYDIR/starrocks/be/storage && touch /.dockerenv
 
 CMD ./entrypoint.sh
diff --git a/docker/dockerfiles/allin1/allin1-ubuntu.Dockerfile b/docker/dockerfiles/allin1/allin1-ubuntu.Dockerfile
index f6abf55fc2aae4..47160edf6c3f59 100644
--- a/docker/dockerfiles/allin1/allin1-ubuntu.Dockerfile
+++ b/docker/dockerfiles/allin1/allin1-ubuntu.Dockerfile
@@ -52,6 +52,7 @@ COPY docker/dockerfiles/allin1/services/ $SR_HOME
 
 RUN cat be.conf >> $DEPLOYDIR/starrocks/be/conf/be.conf && \
     cat fe.conf >> $DEPLOYDIR/starrocks/fe/conf/fe.conf && \
-    mkdir -p $DEPLOYDIR/starrocks/fe/meta && mkdir -p $DEPLOYDIR/starrocks/be/storage && touch /.dockerenv
+    rm -f be.conf fe.conf && \
+    mkdir -p $DEPLOYDIR/starrocks/fe/meta $DEPLOYDIR/starrocks/be/storage && touch /.dockerenv
 
 CMD ./entrypoint.sh
diff --git a/docker/dockerfiles/be/be_entrypoint.sh b/docker/dockerfiles/be/be_entrypoint.sh
index 5423db959e5f7f..60c4563c71c90e 100755
--- a/docker/dockerfiles/be/be_entrypoint.sh
+++ b/docker/dockerfiles/be/be_entrypoint.sh
@@ -115,3 +115,12 @@ if [[ "x$LOG_CONSOLE" == "x1" ]] ; then
     addition_args="--logconsole"
 fi
 $STARROCKS_HOME/bin/start_be.sh $addition_args
+ret=$?
+if [[ $ret -ne 0 && "x$LOG_CONSOLE" != "x1" ]] ; then
+    nol=50
+    log_stderr "Last $nol lines of be.INFO ..."
+    tail -n 50 $STARROCKS_HOME/log/be.INFO
+    log_stderr "Last $nol lines of be.out ..."
+    tail -n 50 $STARROCKS_HOME/log/be.out
+fi
+exit $ret
diff --git a/docker/dockerfiles/be/cn_entrypoint.sh b/docker/dockerfiles/be/cn_entrypoint.sh
index 5f25faaebd212f..acb22a0b280a55 100755
--- a/docker/dockerfiles/be/cn_entrypoint.sh
+++ b/docker/dockerfiles/be/cn_entrypoint.sh
@@ -173,3 +173,12 @@ if [[ "x$LOG_CONSOLE" == "x1" ]] ; then
     addition_args="--logconsole"
 fi
 $STARROCKS_HOME/bin/start_cn.sh $addition_args
+ret=$?
+if [[ $ret -ne 0 && "x$LOG_CONSOLE" != "x1" ]] ; then
+    nol=50
+    log_stderr "Last $nol lines of cn.INFO ..."
+    tail -n $nol $STARROCKS_HOME/log/cn.INFO
+    log_stderr "Last $nol lines of cn.out ..."
+    tail -n $nol $STARROCKS_HOME/log/cn.out
+fi
+exit $ret