From 3fd8300e2ee92a5d9dd150841469a31394ee0e6e Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 7 Apr 2026 10:21:02 +0800 Subject: [PATCH 1/2] fix issue 18139 --- .idea/vcs.xml | 20 +---- deploy/docker/docker-compose.yml | 5 +- deploy/docker/docker-stack.yml | 132 ----------------------------- docs/docs/en/guide/start/docker.md | 19 +++++ docs/docs/zh/guide/start/docker.md | 19 +++++ 5 files changed, 44 insertions(+), 151 deletions(-) delete mode 100644 deploy/docker/docker-stack.yml diff --git a/.idea/vcs.xml b/.idea/vcs.xml index a02c174e4bf9..d7d413a110b0 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,20 +1,4 @@ - + + - + \ No newline at end of file diff --git a/deploy/docker/docker-compose.yml b/deploy/docker/docker-compose.yml index ca7f8fbf52a9..b63228abb713 100644 --- a/deploy/docker/docker-compose.yml +++ b/deploy/docker/docker-compose.yml @@ -18,7 +18,8 @@ version: "3.8" services: dolphinscheduler-postgresql: - image: bitnami/postgresql:15.2.0 + image: bitnamilegacy/postgresql:15.2.0-debian-11-r9 + ports: - "5432:5432" profiles: ["all", "schema"] @@ -37,7 +38,7 @@ services: - dolphinscheduler dolphinscheduler-zookeeper: - image: bitnami/zookeeper:3.7.1 + image: bitnamilegacy/zookeeper:3.7.1-debian-11-r99 profiles: ["all"] environment: ALLOW_ANONYMOUS_LOGIN: "yes" diff --git a/deploy/docker/docker-stack.yml b/deploy/docker/docker-stack.yml deleted file mode 100644 index 29d24280aeff..000000000000 --- a/deploy/docker/docker-stack.yml +++ /dev/null @@ -1,132 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -version: "3.1" - -services: - dolphinscheduler-postgresql: - image: bitnami/postgresql:15.2.0 - environment: - TZ: Asia/Shanghai - POSTGRESQL_USERNAME: root - POSTGRESQL_PASSWORD: root - POSTGRESQL_DATABASE: dolphinscheduler - volumes: - - dolphinscheduler-postgresql:/bitnami/postgresql - networks: - - dolphinscheduler - deploy: - mode: replicated - replicas: 1 - - dolphinscheduler-zookeeper: - image: bitnami/zookeeper:3.7.1 - environment: - TZ: Asia/Shanghai - ALLOW_ANONYMOUS_LOGIN: "yes" - ZOO_4LW_COMMANDS_WHITELIST: srvr,ruok,wchs,cons - volumes: - - dolphinscheduler-zookeeper:/bitnami/zookeeper - networks: - - dolphinscheduler - deploy: - mode: replicated - replicas: 1 - - dolphinscheduler-api: - image: apache/dolphinscheduler-api - ports: - - 12345:12345 - - 25333:25333 - env_file: .env - healthcheck: - test: [ "CMD", "curl", "http://localhost:12345/actuator/health" ] - interval: 30s - timeout: 5s - retries: 3 - volumes: - - dolphinscheduler-logs:/opt/dolphinscheduler/logs - - dolphinscheduler-shared-local:/opt/soft - - dolphinscheduler-resource-local:/dolphinscheduler - networks: - - dolphinscheduler - deploy: - mode: replicated - replicas: 1 - - dolphinscheduler-alert: - image: apache/dolphinscheduler-alert-server - env_file: .env - healthcheck: - test: [ "CMD", "curl", "http://localhost:50053/actuator/health" ] - interval: 30s - timeout: 5s - retries: 3 - volumes: - - dolphinscheduler-logs:/opt/dolphinscheduler/logs - networks: - - dolphinscheduler - deploy: - mode: replicated - replicas: 1 - - dolphinscheduler-master: - image: apache/dolphinscheduler-master - env_file: .env - healthcheck: - test: [ "CMD", "curl", "http://localhost:50053/actuator/health" ] - interval: 30s - timeout: 5s - retries: 3 - volumes: - - dolphinscheduler-logs:/opt/dolphinscheduler/logs - - dolphinscheduler-shared-local:/opt/soft - networks: - - dolphinscheduler - deploy: - mode: replicated - replicas: 1 - - dolphinscheduler-worker: - image: apache/dolphinscheduler-worker - env_file: .env - healthcheck: - test: [ "CMD", "curl", "http://localhost:50053/actuator/health" ] - interval: 30s - timeout: 5s - retries: 3 - volumes: - - dolphinscheduler-worker-data:/tmp/dolphinscheduler - - dolphinscheduler-logs:/opt/dolphinscheduler/logs - - dolphinscheduler-shared-local:/opt/soft - - dolphinscheduler-resource-local:/dolphinscheduler - networks: - - dolphinscheduler - deploy: - mode: replicated - replicas: 1 - -networks: - dolphinscheduler: - driver: overlay - -volumes: - dolphinscheduler-postgresql: - dolphinscheduler-zookeeper: - dolphinscheduler-worker-data: - dolphinscheduler-logs: - dolphinscheduler-shared-local: - dolphinscheduler-resource-local: diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md index 9f9745a23a14..dc261c255ecd 100644 --- a/docs/docs/en/guide/start/docker.md +++ b/docs/docs/en/guide/start/docker.md @@ -11,6 +11,25 @@ There are three ways to start DolphinScheduler with Docker Need to install [Docker](https://docs.docker.com/engine/install/) 1.13.1+ and [Docker Compose](https://docs.docker.com/compose/) 1.28.0+ before starting DolphinScheduler with Docker +## Download Plugins Dependencies + +Starting from version 3.3.0, the binary package no longer provides plugin dependencies, and users need to download them by themselves. The plugin dependency package download address: [Plugin Dependency Package](https://repo.maven.apache.org/maven2/org/apache/dolphinscheduler) +You can also execute the following command to install plugin dependencies: + +```shell +bash ./bin/install-plugins.sh 3.3.0 +``` + +Usually, you do not need all connector plugins, you can specify the plugins you need by configuring `conf/plugins_config`. For example, if you only need the `dolphinscheduler-task-shell` plugin, you can modify the configuration file as follows: + +``` +--task-plugins-- +dolphinscheduler-task-shell +--end-- +``` + +> **_Note:_** The plugin dependency package is usually not included in the binary package. If you encounter a `ClassNotFoundException` error when starting the service, please refer to the documentation of the relevant plugin type to check if the plugin dependency package is missing. For example, `dolphinscheduler-datasource-mysql` does not include `mysql-connector-java.jar`. + ## Start Server ### Using standalone-server Docker Image diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index e5fa13ed4c38..0fd1bff198a1 100644 --- a/docs/docs/zh/guide/start/docker.md +++ b/docs/docs/zh/guide/start/docker.md @@ -10,6 +10,25 @@ 需要安装 [Docker](https://docs.docker.com/engine/install/) 1.13.1 以上版本，以及 [Docker Compose](https://docs.docker.com/compose/) 1.28.0 以上版本。 +## 下载插件依赖 + +从 3.3.0 版本开始，二进制包不再提供插件依赖，需要用户自行下载。插件依赖包下载地址：[插件依赖包](https://repo.maven.apache.org/maven2/org/apache/dolphinscheduler) +你也可以执行以下命令来安装插件依赖: + +```shell +bash ./bin/install-plugins.sh 3.3.0 +``` + +通常你并不需要所有的连接器插件，可以通过配置 `conf/plugins_config` 来指定你所需要的插件，例如，你只需要 `dolphinscheduler-task-shell` 插件，那么您可以修改配置文件如下： + +``` +--task-plugins-- +dolphinscheduler-task-shell +--end-- +``` + +> **_注意:_** 插件依赖包通常不包含在二进制包中，如果你在启动服务时遇到 `ClassNotFoundException` 错误，请参考相关插件类型的文档检查是否缺少插件依赖包，例如 `dolphinscheduler-datasource-mysql` 中不包含 `mysql-connector-java.jar` + ## 启动服务 ### 使用 standalone-server 镜像 From 60b9dae8be0a2dab2d9dbeb24fab05497bcbf182 Mon Sep 17 00:00:00 2001 From: SbloodyS <460888207@qq.com> Date: Tue, 7 Apr 2026 10:23:22 +0800 Subject: [PATCH 2/2] fix issue 18139 --- .idea/vcs.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d7d413a110b0..a02c174e4bf9 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,4 +1,20 @@ + - - - \ No newline at end of file +