From 329a4f25d061fe5ac163d17aa6dc595c00941dc9 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Fri, 13 May 2022 14:06:14 +0800
Subject: [PATCH] fix: docker安装部署 update

---
 Makefile                  |  2 +-
 conf/conf.yaml            |  6 +++---
 docker/Dockerfile         |  5 ++++-
 docker/conf.yaml          | 22 +++-------------------
 docker/docker-compose.yml |  5 +++++
 docker/restart.sh         |  9 ++++-----
 6 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 2362cc5..cb052dd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ GEN_CLIENT=${WORKSPACE}/luban_examples/Tools/Luban.Client/Luban.Client.dll
 CONF_ROOT=${WORKSPACE}/DesignerConfigs
 
 test:
-	go run cmd/test/client.go
+	go run cmd/test/main.go
 http:
 	go run $(race) cmd/httpserver/main.go
 
diff --git a/conf/conf.yaml b/conf/conf.yaml
index 4f71973..d4dfb5a 100644
--- a/conf/conf.yaml
+++ b/conf/conf.yaml
@@ -12,13 +12,13 @@ mongo: &default-mongo
   maxnum: 50
 
 redis: &default-redis
-  address: "127.0.0.1:6100"
+  address: "192.168.0.100:6100"
   auth: ""
 
 etcd:
   dialtimeout: 5
   endpoints:
-    - "192.168.0.206:2379"
+    - "192.168.0.100:2379"
 
 server_account:
   id: 1
@@ -68,7 +68,7 @@ server_game1:
     <<: *default-redis
     db: 0
 test_client:
-  ip: "127.0.0.1"
+  ip: "192.168.0.100"
   port: 8849
   count: 1
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 28c5c0c..78f2fd6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /usr/src/app
 #RUN go mod download && go mod verify
 
 COPY . .
-RUN go build  -tags netgo  -o /usr/local/bin/http cmd/httpserver/main.go && go build -tags netgo   -o /usr/local/bin/game cmd/gameserver/*.go
+RUN go build   -o /usr/local/bin/http cmd/httpserver/main.go && go build  -o /usr/local/bin/game cmd/gameserver/*.go
 
 FROM alpine:3.7 as pro2d
 # 配置国内源
@@ -27,7 +27,10 @@ RUN mkdir -p /data/logs && \
     source /etc/profile
 #RUN apt-get update && \
 #    apt-get install -y net-tools iputils-ping iproute2
+
 EXPOSE 8080
 EXPOSE 8849
+EXPOSE 8880
+EXPOSE 6060
 
 CMD ["http"]
\ No newline at end of file
diff --git a/docker/conf.yaml b/docker/conf.yaml
index f64d785..4c11abd 100644
--- a/docker/conf.yaml
+++ b/docker/conf.yaml
@@ -23,10 +23,10 @@ etcd:
 server_account:
   id: 1
   name: "account"
-  ip: "192.168.0.206"
+  ip: "192.168.0.100"
   port: 8080
   pool_size: 1
-  debugport: 6062
+  debugport: 6060
   mongo:
     <<:  *default-mongo
     dbname: "account"
@@ -37,7 +37,7 @@ server_account:
 server_game:
   id: 1
   name: "game"
-  ip: "192.168.0.206"
+  ip: "192.168.0.100"
   encipher: false
   port: 8849
   debugport: 6060
@@ -51,22 +51,6 @@ server_game:
     <<: *default-redis
     db: 0
 
-server_game1:
-  id: 2
-  name: "game"
-  ip: "192.168.0.206"
-  encipher: false
-  port: 8850
-  debugport: 6061
-  gm: 8881
-  pool_size: 1
-  plugin_path: "./bin/plugin.so"
-  mongo:
-    <<: *default-mongo
-    dbname: "game"
-  redis:
-    <<: *default-redis
-    db: 0
 test_client:
   ip: "127.0.0.1"
   port: 8849
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d99ff7a..a90cd46 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -35,8 +35,10 @@ services:
     restart: always
     ports:
       - '8080:8080'
+      - '6061:6060' #debug
     volumes:
       - ./.docker/account_logs:/data/logs
+      - ./conf.yaml:/data/conf/conf.yaml
     working_dir: /data
     command: [./http]
   game:
@@ -45,7 +47,10 @@ services:
     restart: always
     ports:
       - '8849:8849'
+      - '6060:6060' #debug
+      - '8880:8880' #gm
     volumes:
       - ./.docker/game_logs:/data/logs
+      - ./conf.yaml:/data/conf/conf.yaml
     working_dir: /data
     command: [./game]
diff --git a/docker/restart.sh b/docker/restart.sh
index 47a7334..471d661 100644
--- a/docker/restart.sh
+++ b/docker/restart.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-host='-H 192.168.0.100:2375'
-docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose.yml down
-docker load < /Users/zhaolu/Documents/pro2d/pro2d.tar
-docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose.yml up -d
-docker ps -a
\ No newline at end of file
+/usr/local/bin/docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose.yml down
+/usr/local/bin/docker load < /Users/zhaolu/Documents/pro2d/pro2d.tar
+/usr/local/bin/docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose.yml up -d
+/usr/local/bin/docker ps -a
\ No newline at end of file
--
libgit2 0.21.2