This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 62283c68a fix: devlake timezone issue (#5912)
62283c68a is described below
commit 62283c68aa7d7daa48110867d09a7f00a3655374
Author: abeizn <[email protected]>
AuthorDate: Fri Aug 18 17:19:49 2023 +0800
fix: devlake timezone issue (#5912)
* fix: devlake timezone issue
* fix: devlake timezone issue
---
devops/releases/lake-v0.18.0/docker-compose.yml | 5 ++++-
devops/releases/lake-v0.18.0/env.example | 4 ++--
docker-compose-dev.yml | 9 ++++++---
env.example | 4 ++--
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/devops/releases/lake-v0.18.0/docker-compose.yml
b/devops/releases/lake-v0.18.0/docker-compose.yml
index 809e39572..be63ba2a7 100644
--- a/devops/releases/lake-v0.18.0/docker-compose.yml
+++ b/devops/releases/lake-v0.18.0/docker-compose.yml
@@ -27,6 +27,7 @@ services:
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
+ TZ: UTC
command: --character-set-server=utf8mb4
--collation-server=utf8mb4_bin
--skip-log-bin
@@ -44,6 +45,7 @@ services:
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
+ TZ: UTC
restart: always
depends_on:
- mysql
@@ -59,6 +61,7 @@ services:
- ./.env
environment:
LOGGING_DIR: /app/logs
+ TZ: UTC
depends_on:
- mysql
@@ -71,6 +74,7 @@ services:
environment:
DEVLAKE_ENDPOINT: devlake:8080
GRAFANA_ENDPOINT: grafana:3000
+ TZ: UTC
#ADMIN_USER: devlake
#ADMIN_PASS: merico
depends_on:
@@ -80,4 +84,3 @@ volumes:
mysql-storage:
grafana-storage:
devlake-log:
-
diff --git a/devops/releases/lake-v0.18.0/env.example
b/devops/releases/lake-v0.18.0/env.example
index 1cd73e057..c3b790ac1 100644
--- a/devops/releases/lake-v0.18.0/env.example
+++ b/devops/releases/lake-v0.18.0/env.example
@@ -6,8 +6,8 @@
PLUGIN_DIR=bin/plugins
# Lake Database Connection String
-DB_URL=mysql://merico:merico@mysql:3306/lake?charset=utf8mb4&parseTime=True
-E2E_DB_URL=mysql://merico:merico@mysql:3306/lake_test?charset=utf8mb4&parseTime=True
+DB_URL=mysql://merico:merico@mysql:3306/lake?charset=utf8mb4&parseTime=True&loc=UTC
+E2E_DB_URL=mysql://merico:merico@mysql:3306/lake_test?charset=utf8mb4&parseTime=True&loc=UTC
# Silent Error Warn Info
DB_LOGGING_LEVEL=Error
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index cbca7b9a7..439b84eaa 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -27,12 +27,12 @@ services:
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
- command:
+ TZ: UTC
+ command:
--character-set-server=utf8mb4
--collation-server=utf8mb4_bin
--skip-log-bin
-
postgres:
image: postgres:14.2
volumes:
@@ -44,6 +44,7 @@ services:
POSTGRES_DB: lake
POSTGRES_USER: merico
POSTGRES_PASSWORD: merico
+ TZ: UTC
grafana:
image: devlake.docker.scarf.sh/mericodev/devlake-dashboard:latest
@@ -60,6 +61,7 @@ services:
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
+ TZ: UTC
restart: always
depends_on:
- mysql
@@ -80,6 +82,7 @@ services:
- ./.env
environment:
LOGGING_DIR: /app/logs
+ TZ: UTC
# LOGOUT_URI:
https://xxx.amazoncognito.com/logout?client_id=yyy&logout_uri=http%3A%2F%2Flocalhost%3A4180%2Foauth2%2Fsign_out
depends_on:
- mysql
@@ -95,6 +98,7 @@ services:
environment:
DEVLAKE_ENDPOINT: devlake:8080
GRAFANA_ENDPOINT: grafana:3000
+ TZ: UTC
#ADMIN_USER: devlake
#ADMIN_PASS: letsdivein
depends_on:
@@ -128,4 +132,3 @@ volumes:
grafana-storage:
postgres-storage:
devlake-log:
-
diff --git a/env.example b/env.example
index 718be78cc..522d2327e 100755
--- a/env.example
+++ b/env.example
@@ -7,8 +7,8 @@ PLUGIN_DIR=bin/plugins
REMOTE_PLUGIN_DIR=python/plugins
# Lake Database Connection String
-DB_URL=mysql://merico:merico@mysql:3306/lake?charset=utf8mb4&parseTime=True
-E2E_DB_URL=mysql://merico:merico@mysql:3306/lake_test?charset=utf8mb4&parseTime=True
+DB_URL=mysql://merico:merico@mysql:3306/lake?charset=utf8mb4&parseTime=True&loc=UTC
+E2E_DB_URL=mysql://merico:merico@mysql:3306/lake_test?charset=utf8mb4&parseTime=True&loc=UTC
# Silent Error Warn Info
DB_LOGGING_LEVEL=Error
