Browse Source

[doc] Delete SPRING_DATASOURCE_DRIVER_CLASS_NAME in doc (#10228)

3.1.0-release
旺阳 3 years ago committed by GitHub
parent
commit
87d9ec1dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      .github/workflows/cluster-test/mysql/dolphinscheduler_env.sh
  2. 1
      .github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh
  3. 1
      docs/docs/en/architecture/configuration.md
  4. 2
      docs/docs/en/guide/installation/pseudo-cluster.md
  5. 6
      docs/docs/en/guide/start/docker.md
  6. 1
      docs/docs/en/guide/upgrade.md
  7. 1
      docs/docs/zh/architecture/configuration.md
  8. 2
      docs/docs/zh/guide/installation/pseudo-cluster.md
  9. 6
      docs/docs/zh/guide/start/docker.md
  10. 1
      docs/docs/zh/guide/upgrade.md
  11. 1
      script/env/dolphinscheduler_env.sh

1
.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh

@ -21,7 +21,6 @@ export JAVA_HOME=${JAVA_HOME:-/usr/local/openjdk-8}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-mysql} export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export SPRING_DATASOURCE_URL="jdbc:mysql://mysql:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false" export SPRING_DATASOURCE_URL="jdbc:mysql://mysql:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false"
export SPRING_DATASOURCE_USERNAME=root export SPRING_DATASOURCE_USERNAME=root
export SPRING_DATASOURCE_PASSWORD=123456 export SPRING_DATASOURCE_PASSWORD=123456

1
.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh

@ -21,7 +21,6 @@ export JAVA_HOME=${JAVA_HOME:-/usr/local/openjdk-8}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
export SPRING_DATASOURCE_URL="jdbc:postgresql://postgres:5432/dolphinscheduler" export SPRING_DATASOURCE_URL="jdbc:postgresql://postgres:5432/dolphinscheduler"
export SPRING_DATASOURCE_USERNAME=postgres export SPRING_DATASOURCE_USERNAME=postgres
export SPRING_DATASOURCE_PASSWORD=postgres export SPRING_DATASOURCE_PASSWORD=postgres

1
docs/docs/en/architecture/configuration.md

@ -450,7 +450,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME
export SPRING_DATASOURCE_URL export SPRING_DATASOURCE_URL
export SPRING_DATASOURCE_USERNAME export SPRING_DATASOURCE_USERNAME
export SPRING_DATASOURCE_PASSWORD export SPRING_DATASOURCE_PASSWORD

2
docs/docs/en/guide/installation/pseudo-cluster.md

@ -114,7 +114,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler" export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler"
export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password} export SPRING_DATASOURCE_PASSWORD={password}
@ -179,7 +178,6 @@ Then, modify `./bin/env/dolphinscheduler_env.sh` to use mysql, change {user} and
```shell ```shell
export DATABASE=${DATABASE:-mysql} export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false" export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false"
export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password} export SPRING_DATASOURCE_PASSWORD={password}

6
docs/docs/en/guide/start/docker.md

@ -77,8 +77,6 @@ $ DOLPHINSCHEDULER_VERSION=<version>
# Initialize the database, make sure database <DATABASE> already exists # Initialize the database, make sure database <DATABASE> already exists
$ docker run -d --name dolphinscheduler-tools \ $ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
# Use "com.mysql.cj.jdbc.driver" if you use MySQL
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/<DATABASE>" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/<DATABASE>" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -87,7 +85,6 @@ $ docker run -d --name dolphinscheduler-tools \
# Starting DolphinScheduler service # Starting DolphinScheduler service
$ docker run -d --name dolphinscheduler-master \ $ docker run -d --name dolphinscheduler-master \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -96,7 +93,6 @@ $ docker run -d --name dolphinscheduler-master \
-d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}"
$ docker run -d --name dolphinscheduler-worker \ $ docker run -d --name dolphinscheduler-worker \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -105,7 +101,6 @@ $ docker run -d --name dolphinscheduler-worker \
-d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}"
$ docker run -d --name dolphinscheduler-api \ $ docker run -d --name dolphinscheduler-api \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -114,7 +109,6 @@ $ docker run -d --name dolphinscheduler-api \
-d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}"
$ docker run -d --name dolphinscheduler-alert-server \ $ docker run -d --name dolphinscheduler-alert-server \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \

1
docs/docs/en/guide/upgrade.md

@ -18,7 +18,6 @@
```shell ```shell
export DATABASE=${DATABASE:-mysql} export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 export SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password} export SPRING_DATASOURCE_PASSWORD={password}

1
docs/docs/zh/architecture/configuration.md

@ -431,7 +431,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME
export SPRING_DATASOURCE_URL export SPRING_DATASOURCE_URL
export SPRING_DATASOURCE_USERNAME export SPRING_DATASOURCE_USERNAME
export SPRING_DATASOURCE_PASSWORD export SPRING_DATASOURCE_PASSWORD

2
docs/docs/zh/guide/installation/pseudo-cluster.md

@ -111,7 +111,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler" export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler"
export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password} export SPRING_DATASOURCE_PASSWORD={password}
@ -176,7 +175,6 @@ mysql> FLUSH PRIVILEGES;
```shell ```shell
export DATABASE=${DATABASE:-mysql} export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false" export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false"
export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password} export SPRING_DATASOURCE_PASSWORD={password}

6
docs/docs/zh/guide/start/docker.md

@ -69,8 +69,6 @@ $ DOLPHINSCHEDULER_VERSION=<version>
# 初始化数据库,其确保数据库 <DATABASE> 已经存在 # 初始化数据库,其确保数据库 <DATABASE> 已经存在
$ docker run -d --name dolphinscheduler-tools \ $ docker run -d --name dolphinscheduler-tools \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
# 如果使用 MySQL 则使用 "com.mysql.cj.jdbc.driver"
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/<DATABASE>" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/<DATABASE>" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -79,7 +77,6 @@ $ docker run -d --name dolphinscheduler-tools \
# 启动 DolphinScheduler 对应的服务 # 启动 DolphinScheduler 对应的服务
$ docker run -d --name dolphinscheduler-master \ $ docker run -d --name dolphinscheduler-master \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -88,7 +85,6 @@ $ docker run -d --name dolphinscheduler-master \
-d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}"
$ docker run -d --name dolphinscheduler-worker \ $ docker run -d --name dolphinscheduler-worker \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -97,7 +93,6 @@ $ docker run -d --name dolphinscheduler-worker \
-d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}"
$ docker run -d --name dolphinscheduler-api \ $ docker run -d --name dolphinscheduler-api \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \
@ -106,7 +101,6 @@ $ docker run -d --name dolphinscheduler-api \
-d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}"
$ docker run -d --name dolphinscheduler-alert-server \ $ docker run -d --name dolphinscheduler-alert-server \
-e DATABASE="postgresql" \ -e DATABASE="postgresql" \
-e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \
-e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \
-e SPRING_DATASOURCE_USERNAME="<USER>" \ -e SPRING_DATASOURCE_USERNAME="<USER>" \
-e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \ -e SPRING_DATASOURCE_PASSWORD="<PASSWORD>" \

1
docs/docs/zh/guide/upgrade.md

@ -19,7 +19,6 @@
```shell ```shell
export DATABASE=${DATABASE:-mysql} export DATABASE=${DATABASE:-mysql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
export SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 export SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_USERNAME={user}
export SPRING_DATASOURCE_PASSWORD={password} export SPRING_DATASOURCE_PASSWORD={password}

1
script/env/dolphinscheduler_env.sh vendored

@ -21,7 +21,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java}
# Database related configuration, set database type, username and password # Database related configuration, set database type, username and password
export DATABASE=${DATABASE:-postgresql} export DATABASE=${DATABASE:-postgresql}
export SPRING_PROFILES_ACTIVE=${DATABASE} export SPRING_PROFILES_ACTIVE=${DATABASE}
export SPRING_DATASOURCE_DRIVER_CLASS_NAME
export SPRING_DATASOURCE_URL export SPRING_DATASOURCE_URL
export SPRING_DATASOURCE_USERNAME export SPRING_DATASOURCE_USERNAME
export SPRING_DATASOURCE_PASSWORD export SPRING_DATASOURCE_PASSWORD

Loading…
Cancel
Save