From 63fcbdfe435c3f875f32a4913103e8fee9a22fa4 Mon Sep 17 00:00:00 2001 From: rongchao Date: Fri, 20 Mar 2020 14:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=97=B6=E5=8C=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B7=AE8=E5=B0=8F=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/docker-compose/test/app/admin/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/analysis/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/api/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/auth/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/custom/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/events/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/gateway/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/group/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/heart/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/kpi/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/message/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/news/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/oss/docker-compose.yml | 1 + esua-epdc/docker-compose/test/app/user/docker-compose.yml | 1 + .../docker-compose/test/app/webservice/docker-compose.yml | 1 + .../docker-compose/test/app/websocket/docker-compose.yml | 1 + .../docker-compose/test/node01/1-mysql/docker-compose.yml | 2 +- .../docker-compose/test/node02/1-mysql/docker-compose.yml | 4 ++-- 18 files changed, 19 insertions(+), 3 deletions(-) diff --git a/esua-epdc/docker-compose/test/app/admin/docker-compose.yml b/esua-epdc/docker-compose/test/app/admin/docker-compose.yml index 6019373a7..0f2d27f7f 100644 --- a/esua-epdc/docker-compose/test/app/admin/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/admin/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/admin/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml b/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml index d3a2b7682..cc004bc44 100644 --- a/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/analysis/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/analysis/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/api/docker-compose.yml b/esua-epdc/docker-compose/test/app/api/docker-compose.yml index b16cd61eb..0d509209e 100644 --- a/esua-epdc/docker-compose/test/app/api/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/api/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/api/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/auth/docker-compose.yml b/esua-epdc/docker-compose/test/app/auth/docker-compose.yml index 7f9b5554f..aac8787fa 100644 --- a/esua-epdc/docker-compose/test/app/auth/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/auth/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/auth/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/custom/docker-compose.yml b/esua-epdc/docker-compose/test/app/custom/docker-compose.yml index ecfc4b3e9..48ae797e1 100644 --- a/esua-epdc/docker-compose/test/app/custom/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/custom/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/custom/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/events/docker-compose.yml b/esua-epdc/docker-compose/test/app/events/docker-compose.yml index e0736e849..b12646d79 100644 --- a/esua-epdc/docker-compose/test/app/events/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/events/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/events/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml b/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml index db7ca4f5e..ecae7f10c 100644 --- a/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/gateway/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/gateway/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/group/docker-compose.yml b/esua-epdc/docker-compose/test/app/group/docker-compose.yml index 9cd55ff5b..348885883 100644 --- a/esua-epdc/docker-compose/test/app/group/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/group/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/group/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/heart/docker-compose.yml b/esua-epdc/docker-compose/test/app/heart/docker-compose.yml index a13daf8e7..8c73b0efc 100644 --- a/esua-epdc/docker-compose/test/app/heart/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/heart/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/heart/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml b/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml index b076dc3a3..0eb745bf3 100644 --- a/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/kpi/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/kpi/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/message/docker-compose.yml b/esua-epdc/docker-compose/test/app/message/docker-compose.yml index e62bf2c70..7bf8759d0 100644 --- a/esua-epdc/docker-compose/test/app/message/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/message/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/message/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/news/docker-compose.yml b/esua-epdc/docker-compose/test/app/news/docker-compose.yml index 21bc3dbbc..cf120910a 100644 --- a/esua-epdc/docker-compose/test/app/news/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/news/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/news/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/oss/docker-compose.yml b/esua-epdc/docker-compose/test/app/oss/docker-compose.yml index 3f3d3a3dd..d677638c4 100644 --- a/esua-epdc/docker-compose/test/app/oss/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/oss/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/oss/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/user/docker-compose.yml b/esua-epdc/docker-compose/test/app/user/docker-compose.yml index bef19bdd1..8ad2e482b 100644 --- a/esua-epdc/docker-compose/test/app/user/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/user/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/user/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml b/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml index f05e0b24d..77397cdea 100644 --- a/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/webservice/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/websocket/logs:/logs diff --git a/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml b/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml index 9134eff99..b78cd6043 100644 --- a/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml +++ b/esua-epdc/docker-compose/test/app/websocket/docker-compose.yml @@ -8,4 +8,5 @@ services: restart: always volumes: - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/app/websocket/logs:/logs diff --git a/esua-epdc/docker-compose/test/node01/1-mysql/docker-compose.yml b/esua-epdc/docker-compose/test/node01/1-mysql/docker-compose.yml index 8b30115d1..4803c951f 100644 --- a/esua-epdc/docker-compose/test/node01/1-mysql/docker-compose.yml +++ b/esua-epdc/docker-compose/test/node01/1-mysql/docker-compose.yml @@ -11,7 +11,7 @@ services: MYSQL_LOWER_CASE_TABLE_NAMES: 1 volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone + - /etc/timezone:/etc/timezone:ro - /opt/epdc/mysql/data:/var/lib/mysql - /opt/epdc/mysql/conf/mysql.conf.cnf:/etc/mysql/conf.d/mysql.conf.cnf restart: always diff --git a/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml b/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml index 2f8f2142a..3ab10d545 100644 --- a/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml +++ b/esua-epdc/docker-compose/test/node02/1-mysql/docker-compose.yml @@ -10,8 +10,8 @@ services: MYSQL_ROOT_PASSWORD: epdc!elink1405 MYSQL_LOWER_CASE_TABLE_NAMES: 1 volumes: - - /etc/localtime:/etc/localtime - - /etc/timezone:/etc/timezone + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro - /opt/epdc/mysql/data:/var/lib/mysql - /opt/epdc/mysql/conf/mysql.conf.cnf:/etc/mysql/conf.d/mysql.conf.cnf restart: always