From 4010832e73b84cb66222c0181798735e50a6a656 Mon Sep 17 00:00:00 2001
From: "xikai.wxk" <xikai.wxk@antgroup.com>
Date: Thu, 16 Mar 2023 19:19:02 +0800
Subject: [PATCH] redirect logs from ceresdb container in integration tests

---
 .github/workflows/ci.yml |  4 ++++
 Dockerfile-CI            |  2 +-
 docker-compose.yaml      |  2 --
 docker/entrypoint-ci.sh  | 19 -------------------
 4 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 docker/entrypoint-ci.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3205bee55b..83d52a6dea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -179,6 +179,10 @@ jobs:
           make integration-test
         env:
           RUST_BACKTRACE: "1"
+      - name: Redirect Logs
+        run: |
+          docker logs -t ceresdb0 > /tmp/ceresdb-0.log
+          docker logs -t ceresdb1 > /tmp/ceresdb-1.log
       - name: Upload Logs
         if: always()
         uses: actions/upload-artifact@v3
diff --git a/Dockerfile-CI b/Dockerfile-CI
index 4a6e71dde2..eb5c829db1 100644
--- a/Dockerfile-CI
+++ b/Dockerfile-CI
@@ -14,7 +14,7 @@ ENV RUST_BACKTRACE 1
 COPY ./ceresdb-server /usr/bin/ceresdb-server
 RUN chmod +x /usr/bin/ceresdb-server
 
-COPY ./docker/entrypoint-ci.sh /entrypoint.sh
+COPY ./docker/entrypoint.sh /entrypoint.sh
 COPY ./docs/minimal.toml /etc/ceresdb/ceresdb.toml
 
 COPY ./docker/tini /tini
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 645b321059..cd2cc5407e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,7 +16,6 @@ services:
       - "5441:5441"
     volumes:
       - ./docker/ceresdb-cluster-0.toml:/etc/ceresdb/ceresdb.toml
-      - /tmp/ceresdb-0.log:/tmp/ceresdb.log
     depends_on:
       - ceresmeta
 
@@ -28,6 +27,5 @@ services:
       - "5442:5442"
     volumes:
       - ./docker/ceresdb-cluster-1.toml:/etc/ceresdb/ceresdb.toml
-      - /tmp/ceresdb-1.log:/tmp/ceresdb.log
     depends_on:
       - ceresmeta
diff --git a/docker/entrypoint-ci.sh b/docker/entrypoint-ci.sh
deleted file mode 100644
index 44be03c6b5..0000000000
--- a/docker/entrypoint-ci.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -exo pipefail
-
-## init varibles
-USER="ceres"
-DATA_DIR="/home/${USER}/data"
-DATA_PATH="${DATA_DIR}/ceresdb"
-CONFIG_FILE="/etc/ceresdb/ceresdb.toml"
-
-# enable jemalloc heap profiling
-export MALLOC_CONF="prof:true,prof_active:false,lg_prof_sample:19"
-
-## data dir
-mkdir -p ${DATA_DIR}
-chmod +777 -R ${DATA_DIR}
-chown -R ${USER}.${USER} ${DATA_DIR}
-
-exec /usr/bin/ceresdb-server --config ${CONFIG_FILE} &> /tmp/ceresdb.log