From 2fb6a9328dd47f51ecc1846c7551ae3e4650a5d3 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sun, 31 May 2020 11:12:07 +0800
Subject: [PATCH] update

Former-commit-id: 88adeae4d93fb84287ac03ac657cb216c0ce149c
---
 publish/src/linux-x64/publish/.gitignore      |  1 +
 .../src/linux-x64/publish/docker-compose.yml  | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/publish/src/linux-x64/publish/.gitignore b/publish/src/linux-x64/publish/.gitignore
index 315188a4..fdf42770 100644
--- a/publish/src/linux-x64/publish/.gitignore
+++ b/publish/src/linux-x64/publish/.gitignore
@@ -1,3 +1,4 @@
+.vscode
 log
 docker/log
 docker/data
\ No newline at end of file
diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml
index 213fc249..f7e7ab3f 100644
--- a/publish/src/linux-x64/publish/docker-compose.yml
+++ b/publish/src/linux-x64/publish/docker-compose.yml
@@ -12,7 +12,7 @@ services:
             - ./docker/data/portainer:/data
     minio:
         image: minio/minio:RELEASE.2020-05-29T14-08-49Z
-        #restart: always
+        restart: always
         environment:
             MINIO_ACCESS_KEY: "admin"
             MINIO_SECRET_KEY: "12345678"
@@ -35,8 +35,13 @@ services:
     phpmyadmin: 
         image: phpmyadmin/phpmyadmin
         restart: always
+        environment: 
+            - PMA_HOST=mysql
+            - PMA_PORT=3306
         ports: 
             - 9003:80
+        depends_on: 
+            - mysql
     redis:
         image: redis:6.0
         restart: always
@@ -46,6 +51,8 @@ services:
         image: erikdubbelboer/phpredisadmin
         restart: always
         environment: 
+            - REDIS_1_HOST=redis
+            - REDIS_1_PORT=6379
             - ADMIN_USER=admin
             - ADMIN_PASS=123456
         ports: 
@@ -64,6 +71,18 @@ services:
             - 8086:8086
         volumes: 
             - ./docker/data/influxdb:/var/lib/influxdb
+    influxdb-web:
+        image: influxdb:1.2.4
+        restart: always
+        environment: 
+            TZ: "Asia/Shanghai"
+            INFLUXDB_ADMIN_ENABLED: "true"
+            INFLUXDB_ADMIN_USER: admin
+            INFLUXDB_ADMIN_PASSWORD: admin
+        ports: 
+            - 8083:8083
+        depends_on: 
+            - influxdb
     srs:
         image: ossrs/srs:v4.0.23
         environment: