From 599203c3491683b3a6460093e0423bb54ad70286 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 27 Jun 2024 16:55:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(X-Pack):=20=E5=AE=89=E8=A3=85=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=8A=8A=E5=AE=9E=E7=8E=B0=E7=B1=BB=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=88=B0=E4=B8=BB=E7=BA=BF=E7=A8=8B=E7=B1=BB=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 7857e36cbd..27a6e57f9f 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 7857e36cbd3d11730493429e2c70aa3b956434db +Subproject commit 27a6e57f9f7895f9dc4e156d835729639f735576 From 1c4ecef0e7f78babe59481fb495b52297d02ed38 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 27 Jun 2024 16:59:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=AD=98=E5=82=A8=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- installer/dataease/docker-compose.yml | 1 + installer/install.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 906088419e..63138921e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM registry.cn-qingdao.aliyuncs.com/dataease/alpine-openjdk21-jre -RUN mkdir -p /opt/apps/config /opt/dataease2.0/drivers/ /opt/dataease2.0/cache/ /opt/dataease2.0/data/map /opt/dataease2.0/data/static-resource/ /opt/dataease2.0/data/appearance/ /opt/dataease2.0/data/exportData/ +RUN mkdir -p /opt/apps/config /opt/dataease2.0/drivers/ /opt/dataease2.0/cache/ /opt/dataease2.0/data/map /opt/dataease2.0/data/static-resource/ /opt/dataease2.0/data/appearance/ /opt/dataease2.0/data/exportData/ /opt/dataease2.0/data/plugin/ ADD drivers/* /opt/dataease2.0/drivers/ ADD mapFiles/ /opt/dataease2.0/data/map/ diff --git a/installer/dataease/docker-compose.yml b/installer/dataease/docker-compose.yml index 97753b8fcc..f4f783c313 100644 --- a/installer/dataease/docker-compose.yml +++ b/installer/dataease/docker-compose.yml @@ -14,6 +14,7 @@ services: - ${DE_BASE}/dataease2.0/data/geo:/opt/dataease2.0/data/geo - ${DE_BASE}/dataease2.0/data/appearance:/opt/dataease2.0/data/appearance - ${DE_BASE}/dataease2.0/data/exportData:/opt/dataease2.0/data/exportData + - ${DE_BASE}/dataease2.0/data/plugin:/opt/dataease2.0/data/plugin depends_on: DE_MYSQL_HOST: condition: service_healthy diff --git a/installer/install.sh b/installer/install.sh index 5cd3712750..81eadb5eba 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -104,7 +104,7 @@ function prepare_de_run_base() { 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,appearance,exportData} + mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo,appearance,exportData,plugin} 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 ${DE_RUN_BASE}/task/logs