From c9a752e19870a4a32aba034106b6c825e1769462 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 11 Jan 2024 18:39:42 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++- de-xpack | 2 +- installer/dataease/docker-compose-task.yml | 12 ++++++++++++ installer/install.sh | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 installer/dataease/docker-compose-task.yml diff --git a/Dockerfile b/Dockerfile index f5118e68fd..986319240f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,11 @@ WORKDIR /opt/apps ADD core/core-backend/target/CoreApplication.jar /opt/apps/app.jar ADD de-xpack/xpack-permissions/target/xpack-permissions-$IMAGE_TAG.jar /opt/apps/xpack-permission.jar ADD de-xpack/xpack-base/target/xpack-base-$IMAGE_TAG.jar /opt/apps/xpack-base.jar +ADD de-xpack/xpack-sync/target/xpack-sync-$IMAGE_TAG.jar /opt/apps/xpack-sync.jar ENV JAVA_APP_JAR=/opt/apps/app.jar HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD curl -f 127.0.0.1:8100 -CMD java -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/dataease2.0/logs/dump.hprof -Dloader.path=/opt/apps/xpack-permission.jar,/opt/apps/xpack-base.jar -jar /opt/apps/app.jar +CMD java -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/dataease2.0/logs/dump.hprof -Dloader.path=/opt/apps/xpack-permission.jar,/opt/apps/xpack-base.jar,/opt/apps/xpack-sync.jar -jar /opt/apps/app.jar diff --git a/de-xpack b/de-xpack index d417a5d19e..975be1ce83 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit d417a5d19e936fcb86b72f9350f377bd98772fac +Subproject commit 975be1ce83c7d6a6e5648123af35b0031231d91e diff --git a/installer/dataease/docker-compose-task.yml b/installer/dataease/docker-compose-task.yml new file mode 100644 index 0000000000..b84afdeeac --- /dev/null +++ b/installer/dataease/docker-compose-task.yml @@ -0,0 +1,12 @@ +version: '2.1' +services: + task-actuator: + image: registry.cn-qingdao.aliyuncs.com/dataease/dataease-sync-task:DE_TAG + container_name: sync-task-actuator + ports: + - 9001:9001 + volumes: + - ${DE_BASE}/dataease2.0/task/conf:/opt/apps/config + - ${DE_BASE}/dataease2.0/task/logs:/opt/dataease2.0/logs + networks: + - dataease-network \ No newline at end of file diff --git a/installer/install.sh b/installer/install.sh index dfe7403778..b47d1d7914 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -63,6 +63,7 @@ env | grep DE_ >.env mkdir -p ${DE_RUN_BASE}/{cache,logs,conf} mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo} mkdir -p ${DE_RUN_BASE}/apisix/logs +mkdir -p ${DE_RUN_BASE}/task/logs chmod 777 ${DE_RUN_BASE}/apisix/logs ${DE_RUN_BASE}/data/etcd_data if [ "${DE_EXTERNAL_MYSQL}" = "false" ]; then