moss与应用共用一个mysql实例

WSLAF · Oct 19, 2019 · dd7b9ab · dd7b9ab
1 parent 10e24aa
commit dd7b9ab
Show file tree

Hide file tree

Showing 5 changed files with 274 additions and 952 deletions.
diff --git a/common/web/pom.xml b/common/web/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>[2.9.10,)</version>
+            <version>2.9.10</version>
         </dependency>
         <!--mybatis plus依赖包-->
         <dependency>

diff --git a/docker-compose/.env-moss b/docker-compose/.env-moss
@@ -1,11 +1,11 @@
 ### MOSS
 MOSS_DB_TYPE=mysql
 MOSS_PORT=8086
-MOSS_SKYWALKING_HOST=localhost
+MOSS_SKYWALKING_HOST=skywalking-oap
 MOSS_SKYWALKING_PORT=12800
 
 ### 数据源mysql实例
-DATASOURCE_HOST=moss-db
+DATASOURCE_HOST=mysql
 DATASOURCE_PORT=3306
 DATASOURCE_USERNAME=root
 DATASOURCE_PASSWORD=root123

diff --git a/docker-compose/docker-compose.moss.yml b/docker-compose/docker-compose.moss.yml
@@ -1,19 +1,15 @@
 version: '3'
 services:
-  #MOSS Mysql数据库
-  moss-db:
+  #MOSS Mysql数据库初使化
+  moss-db-init:
     image: mysql:5.7
-    container_name: moss-db
-    restart: always
+    command: /init-db.sh
     networks:
       - sc-net
-    ports:
-      - 3306:3306
     volumes:
-      - ./moss/mysql:/docker-entrypoint-initdb.d
-      - ./data/mysql:/var/lib/mysql
+      - ./moss/mysql:/sql
+      - ./init-db.sh:/init-db.sh
     environment:
-      TZ: Asia/Shanghai
       MYSQL_ROOT_PASSWORD: root123
 
   #Moss管理中心
@@ -29,4 +25,4 @@ services:
     environment:
       TZ: Asia/Shanghai
     depends_on:
-      - moss-db
+      - moss-db-init