Browse Source

[Improvement][docker] Add SPRING_JACKSON_TIME_ZONE to .env file (#13271)

* tz in docker

* update default tz and update doc

Co-authored-by: chenjiaming <chenjiaming@kezaihui.com>
3.2.0-release
陈家名 2 years ago committed by GitHub
parent
commit
9199049180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      deploy/docker/.env
  2. 5
      docs/docs/en/guide/start/docker.md
  3. 5
      docs/docs/zh/guide/start/docker.md

1
deploy/docker/.env

@ -20,5 +20,6 @@ TAG=latest
TZ=Asia/Shanghai TZ=Asia/Shanghai
DATABASE=postgresql DATABASE=postgresql
SPRING_JACKSON_TIME_ZONE=UTC
SPRING_DATASOURCE_URL=jdbc:postgresql://dolphinscheduler-postgresql:5432/dolphinscheduler SPRING_DATASOURCE_URL=jdbc:postgresql://dolphinscheduler-postgresql:5432/dolphinscheduler
REGISTRY_ZOOKEEPER_CONNECT_STRING=dolphinscheduler-zookeeper:2181 REGISTRY_ZOOKEEPER_CONNECT_STRING=dolphinscheduler-zookeeper:2181

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

@ -79,6 +79,7 @@ $ docker run -d --name dolphinscheduler-tools \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
--net host \ --net host \
apache/dolphinscheduler-tools:"${DOLPHINSCHEDULER_VERSION}" tools/bin/upgrade-schema.sh apache/dolphinscheduler-tools:"${DOLPHINSCHEDULER_VERSION}" tools/bin/upgrade-schema.sh
# Starting DolphinScheduler service # Starting DolphinScheduler service
@ -87,6 +88,7 @@ $ docker run -d --name dolphinscheduler-master \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}"
@ -95,6 +97,7 @@ $ docker run -d --name dolphinscheduler-worker \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}"
@ -103,6 +106,7 @@ $ docker run -d --name dolphinscheduler-api \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}"
@ -111,6 +115,7 @@ $ docker run -d --name dolphinscheduler-alert-server \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-alert-server:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-alert-server:"${DOLPHINSCHEDULER_VERSION}"

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

@ -72,6 +72,7 @@ $ docker run -d --name dolphinscheduler-tools \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
--net host \ --net host \
apache/dolphinscheduler-tools:"${DOLPHINSCHEDULER_VERSION}" tools/bin/upgrade-schema.sh apache/dolphinscheduler-tools:"${DOLPHINSCHEDULER_VERSION}" tools/bin/upgrade-schema.sh
# 启动 DolphinScheduler 对应的服务 # 启动 DolphinScheduler 对应的服务
@ -80,6 +81,7 @@ $ docker run -d --name dolphinscheduler-master \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}"
@ -88,6 +90,7 @@ $ docker run -d --name dolphinscheduler-worker \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}"
@ -96,6 +99,7 @@ $ docker run -d --name dolphinscheduler-api \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}"
@ -104,6 +108,7 @@ $ docker run -d --name dolphinscheduler-alert-server \
-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>" \
-e SPRING_JACKSON_TIME_ZONE="UTC" \
-e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \ -e REGISTRY_ZOOKEEPER_CONNECT_STRING="localhost:2181" \
--net host \ --net host \
-d apache/dolphinscheduler-alert-server:"${DOLPHINSCHEDULER_VERSION}" -d apache/dolphinscheduler-alert-server:"${DOLPHINSCHEDULER_VERSION}"

Loading…
Cancel
Save