From 95abfe2a87e8038fedc6ea1d5f2bc87070a65a85 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Wed, 29 May 2024 16:34:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0selenium=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/dataease/docker-compose-apisix.yml | 2 +- installer/dataease/docker-compose-mysql.yml | 2 +- installer/dataease/docker-compose-selenium.yml | 15 +++++++++++++++ installer/dataease/docker-compose-task.yml | 2 +- installer/dataease/docker-compose.yml | 2 +- installer/dectl | 4 ++++ 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 installer/dataease/docker-compose-selenium.yml diff --git a/installer/dataease/docker-compose-apisix.yml b/installer/dataease/docker-compose-apisix.yml index e6cac7dccc..adf43e7ebd 100644 --- a/installer/dataease/docker-compose-apisix.yml +++ b/installer/dataease/docker-compose-apisix.yml @@ -1,4 +1,4 @@ -version: "2.1" +version: "3" services: apisix-dashboard: diff --git a/installer/dataease/docker-compose-mysql.yml b/installer/dataease/docker-compose-mysql.yml index 42ff0c2381..f9f97dff34 100644 --- a/installer/dataease/docker-compose-mysql.yml +++ b/installer/dataease/docker-compose-mysql.yml @@ -1,4 +1,4 @@ -version: '2.1' +version: '3' services: DE_MYSQL_HOST: diff --git a/installer/dataease/docker-compose-selenium.yml b/installer/dataease/docker-compose-selenium.yml new file mode 100644 index 0000000000..bfa26ea3d8 --- /dev/null +++ b/installer/dataease/docker-compose-selenium.yml @@ -0,0 +1,15 @@ +version: '3' +services: + de-selenium: + image: registry.cn-qingdao.aliyuncs.com/dataease/standalone-chromium:123.0 + container_name: de-selenium + shm_size: 2gb + privileged: true + environment: + - SE_START_XVFB=false + - SE_ENABLE_BROWSER_LEFTOVERS_CLEANUP=true + - SE_NODE_OVERRIDE_MAX_SESSIONS=true + - SE_NODE_MAX_SESSIONS=5 + - TZ=Asia/Shanghai + networks: + - dataease-network \ No newline at end of file diff --git a/installer/dataease/docker-compose-task.yml b/installer/dataease/docker-compose-task.yml index 1248bb0f40..25e4386f1e 100644 --- a/installer/dataease/docker-compose-task.yml +++ b/installer/dataease/docker-compose-task.yml @@ -1,4 +1,4 @@ -version: '2.1' +version: '3' services: task-actuator: image: registry.cn-qingdao.aliyuncs.com/dataease/dataease-sync-task:DE_TAG diff --git a/installer/dataease/docker-compose.yml b/installer/dataease/docker-compose.yml index eec54a4e28..97753b8fcc 100644 --- a/installer/dataease/docker-compose.yml +++ b/installer/dataease/docker-compose.yml @@ -1,4 +1,4 @@ -version: '2.1' +version: '3' services: dataease: diff --git a/installer/dectl b/installer/dectl index 8bd45401cd..e822d921e6 100644 --- a/installer/dectl +++ b/installer/dectl @@ -53,6 +53,10 @@ function _generate_compose_file_args() { if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]];then compose_files="${compose_files} -f docker-compose-task.yml" fi + + if [[ -f $DE_RUNNING_BASE/docker-compose-selenium.yml ]];then + compose_files="${compose_files} -f docker-compose-selenium.yml" + fi fi } function _check_apisix_init() {