From f91c82b241059863bbf961088f2be1ab6c24c2ae Mon Sep 17 00:00:00 2001 From: pycook Date: Mon, 11 Nov 2019 23:11:12 +0800 Subject: [PATCH] fix timezone --- docker-compose.yml | 9 ++++++--- docs/Dockerfile | 0 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 docs/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index e058551..d3af339 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: container_name: cmdb-db environment: TZ: Asia/Shanghai - MYSQL_ROOT_PASSWORD: '123456' + MYSQL_ROOT_PASSWORD: '123456' MYSQL_DATABASE: 'cmdb' MYSQL_USER: 'cmdb' MYSQL_PASSWORD: '123456' @@ -16,7 +16,7 @@ services: networks: new: aliases: - - mysql + - mysql cmdb-cache: image: redis:latest @@ -32,6 +32,8 @@ services: dockerfile: api/Dockerfile image: cmdb-api:0.1 container_name: cmdb-api + environment: + TZ: Asia/Shanghai command: - /bin/bash - -c @@ -53,9 +55,10 @@ services: dockerfile: Dockerfile image: cmdb-ui:0.1 container_name: cmdb-ui - depends_on: + depends_on: - cmdb-api environment: + TZ: Asia/Shanghai CMDB_API_HOST: cmdb-api:5000 NGINX_PORT: 80 volumes: diff --git a/docs/Dockerfile b/docs/Dockerfile new file mode 100644 index 0000000..e69de29