update docker config

4 years ago · 29bc1a4e6c
parent 0121cb24e0
commit 29bc1a4e6c
13 changed files with 43 additions and 73 deletions
--- a/docker/conf/dsBigData/Config/Config.docker.ini
+++ b/docker/conf/dsBigData/Config/Config.docker.ini
@ -21,4 +21,4 @@ port = 8004
 project_name = dsBigData

 [elasticsearch]
-url = http://10.10.14.212:9200
+url = http://elasticsearch:9200
--- a/docker/conf/dsSso/Config/Config.docker.ini
+++ b/docker/conf/dsSso/Config/Config.docker.ini
@ -19,7 +19,7 @@ port = 6379
 db = 0

 [kafka]
-KafkaAddress = 10.10.14.238:9092
+KafkaAddress = kafka:9092
 KafkaAccessLogTopic = dsAccessLog
 # ----------------------------------------------------------------------------------------------------

--- a/docker/conf/dsSupport/Config/Config.docker.ini
+++ b/docker/conf/dsSupport/Config/Config.docker.ini
@ -36,7 +36,7 @@ port = 8005
 ;nodes = http://10.10.14.188:9200
 ##nodes = http://10.10.14.61:9200,http://10.10.14.62:9200,http://10.10.14.63:9200
 ##nodes = http://192.168.0.200:9200,http://192.168.0.200:9201,http://192.168.0.200:9202
-nodes = http://10.10.14.61:9200,http://10.10.14.62:9200,http://10.10.14.63:9200
+nodes = http://elasticsearch:9200
 ;http://10.10.14.188:9200,
 ;nodes = http://192.168.0.200:9200,http://192.168.0.200:9201,http://192.168.0.200:9202
 user = root
--- a/docker/docker-compose.build.sh
+++ b/docker/docker-compose.build.sh
@ -22,7 +22,7 @@ cp -r ./Config ./build/Config
 mv -f ./build ../docker/app/dsBaseWeb

 # dsBigData
-cd $SRC/dsBaseWeb
+cd $SRC/dsBigData
 go build -o ./build/dsBigData main.go
 cp -r ./Shell ./build
 cp -r ./Config ./build/Config
--- a/docker/docker-compose.pro.yml
+++ b/docker/docker-compose.pro.yml
@ -12,7 +12,7 @@ services:
        command: bash -c "./dsBaseRpc"
    dsbaseweb:
        image: debian:buster-20210511
-        restart: always
+        #restart: always
        ports:
            - 8002:8002
        volumes:
@ -20,11 +20,12 @@ services:
            - ./conf/dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsBaseWeb"
+        #command: tail -f /dev/null
        depends_on: 
            - kafka
    dsbigdata:
        image: debian:buster-20210511
-        restart: always
+        #restart: always
        ports:
            - 8004:8004
        volumes:
@ -32,6 +33,8 @@ services:
            - ./conf/dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsBigData"
+        depends_on: 
+            - elasticsearch
    dssso:
        image: debian:buster-20210511
        restart: always
@ -42,6 +45,8 @@ services:
            - ./conf/dsSso/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsSso"
+        depends_on: 
+            - kafka
    dssupport:
        image: debian:buster-20210511
        restart: always
@ -52,3 +57,5 @@ services:
            - ./conf/dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsSupport"
+        depends_on: 
+            - elasticsearch
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -61,3 +61,33 @@ services:
            interval: 10s
            timeout: 10s
            retries: 10
+    elasticsearch:
+        image: elasticsearch:7.12.0
+        healthcheck:
+            test: ["CMD", "nc", "-vz", "localhost", "9200"]
+            interval: 10s
+            timeout: 10s
+            retries: 10
+        restart: always
+        environment:
+            - ES_JAVA_OPTS=-Xms512m -Xmx512m
+            - discovery.type=single-node
+            - http.cors.enabled=true
+            - http.cors.allow-origin=*
+        ports:
+            - 9200:9200
+            - 9300:9300
+        volumes:
+            #chmod 777 elasticsearch
+            - ${ELASTICSEARCH_DATA}:/usr/share/elasticsearch/data
+    # greenplum:
+    #     image: 76527413/greenplum:6.16.2
+    #     restart: always
+    #     hostname: greenplum_singlenode
+    #     environment:
+    #         - DATABASE=exampledb
+    #     ports:
+    #         - 5432:5432
+    #     volumes:
+    #         - ${GREENPLUM_DATA}:/data
+    #         - ${GREENPLUM_LOG}:/home/gpadmin/gpAdminLogs
--- a/dsBigData/build/Config/Config.ini
+++ b/dsBigData/build/Config/Config.ini
@ -1,24 +0,0 @@
-[distribute]    #发布功能的配置
-ip = 10.10.14.211
-port = 22
-user = root
-pwd = dsideal
-remotePath = /usr/local/dsMin/dsBigData/
-localPath = E:/Work/dsMin/dsBigData
-
-[redis]
-ip = 127.0.0.1
-port = 18890
-db = 0
-expireTime = 86400
-
-#gin服务器的端口
-[server]
-port = 8004
-
-# 本项目名称，用于记录日志
-[project]
-project_name = dsBigData
-
-[elasticsearch]
-url = http://10.10.14.212:9200
--- a/dsBigData/build/Config/White.txt
+++ b/dsBigData/build/Config/White.txt
@ -1,7 +0,0 @@
-.ico
-.html
-.css
-.jpg
-.jpeg
-.png
-/base/sso/CheckSsoCode
--- a/dsBigData/build/Config/logo.txt
+++ b/dsBigData/build/Config/logo.txt
@ -1,12 +0,0 @@
-      _     ____  _       _____        _
-     | |   |  _ \(_)     |  __ \      | |
-   __| |___| |_) |_  __ _| |  | | __ _| |_ __ _
-  / _` / __|  _ <| |/ _` | |  | |/ _` | __/ _` |
- | (_| \__ \ |_) | | (_| | |__| | (_| | || (_| |
-  \__,_|___/____/|_|\__, |_____/ \__,_|\__\__,_|
-                     __/ |
-                    |___/
-Created By HuangHai 2020-01-20
-http://patorjk.com/software/taag/#p=display&f=Big&t=dsBigData
-
-
--- a/dsBigData/build/debug.sh
+++ b/dsBigData/build/debug.sh
@ -1,10 +0,0 @@
-#!/bin/bash
-
-# 杀掉进程
-kill -9 `pgrep -f dsBigData` 2>/dev/null
-sleep 3
-
-cd /usr/local/dsMin/dsBigData
-chmod +x dsBigData
-# 运行为后台进程
-/usr/local/dsMin/dsBigData/dsBigData
--- a/dsBigData/build/dsBigData
+++ b/dsBigData/build/dsBigData
--- a/dsBigData/build/start.sh
+++ b/dsBigData/build/start.sh
@ -1,10 +0,0 @@
-#!/bin/bash
-
-
-# 杀掉进程
-kill -9 `pgrep -f dsBigData` 2>/dev/null
-sleep 3
-
-chmod +x dsBigData
-# 运行为后台进程
-nohup /usr/local/dsMin/dsBigData/dsBigData  >> /usr/local/dsMin/dsBigData/dsBigData.log 2>&1 &
--- a/dsBigData/build/stop.sh
+++ b/dsBigData/build/stop.sh
@ -1,4 +0,0 @@
-#!/bin/bash
-
-# kill 命令不使用 -9 参数时，会回调 onStop() 方法，确定不需要此回调建议使用 -9 参数
-kill -9 `pgrep -f dsBigData` 2>/dev/null