From 24283e5d32ea05179bcbb9bd90a1ac2bbcf21e0e Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Wed, 8 Jun 2022 11:18:41 +0800
Subject: [PATCH] fix: docker 安装

---
 docker/docker-compose-service.yml | 27 +++++++++++++++++++++++++++
 docker/docker-compose.yml         | 56 --------------------------------------------------------
 docker/restart.sh                 |  6 +++---
 docker/serverlist.yml             |  5 +++++
 4 files changed, 35 insertions(+), 59 deletions(-)
 create mode 100644 docker/docker-compose-service.yml
 delete mode 100644 docker/docker-compose.yml

diff --git a/docker/docker-compose-service.yml b/docker/docker-compose-service.yml
new file mode 100644
index 0000000..0305aca
--- /dev/null
+++ b/docker/docker-compose-service.yml
@@ -0,0 +1,27 @@
+version: '3.3'
+services:
+  account:
+    image: pro2d
+    container_name: account-pro2d
+    restart: always
+    ports:
+      - '8080:8080'
+      - '6061:6060' #debug
+    volumes:
+      - ./.docker/account_logs:/data/logs
+      - ./conf.yml:/data/conf/conf.yml
+    working_dir: /data
+    command: [./http]
+  game:
+    image: pro2d
+    container_name: game-pro2d
+    restart: always
+    ports:
+      - '8849:8849'
+      - '6060:6060' #debug
+      - '8880:8880' #gm
+    volumes:
+      - ./.docker/game_logs:/data/logs
+      - ./conf.yml:/data/conf/conf.yml
+    working_dir: /data
+    command: [./game]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index fb110a4..0000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-version: '3.3'
-services:
-  db:
-    image: mongo
-    container_name: mongodb-pro2d
-    ports:
-      - '27017:27017'
-    restart: always
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root #mongo默认的账号
-      MONGO_INITDB_ROOT_PASSWORD: root #mongo默认的密码
-    volumes:
-      - ./.docker/mongo_data:/data/db
-      - ./.docker/mongo.conf:/data/mongo.conf
-#    command: --config /data/mongo.conf # 配置文件
-    command: [--auth] # 配置文件
-#  etcd:
-#    image: xieyanze/etcd3
-#    container_name: etcd3-pro2d
-#    restart: always
-#    ports:
-#    - '2379:2379'
-  redis:
-    image: redis:latest
-    container_name: redis-pro2d
-    restart: always
-    ports:
-    - '6100:6379'
-    volumes:
-      - ./.docker/redis_data:/data/db
-
-  account:
-    image: pro2d
-    container_name: account-pro2d
-    restart: always
-    ports:
-      - '8080:8080'
-      - '6061:6060' #debug
-    volumes:
-      - ./.docker/account_logs:/data/logs
-      - ./conf.yml:/data/conf/conf.yml
-    working_dir: /data
-    command: [./http]
-  game:
-    image: pro2d
-    container_name: game-pro2d
-    restart: always
-    ports:
-      - '8849:8849'
-      - '6060:6060' #debug
-      - '8880:8880' #gm
-    volumes:
-      - ./.docker/game_logs:/data/logs
-      - ./conf.yml:/data/conf/conf.yml
-    working_dir: /data
-    command: [./game]
diff --git a/docker/restart.sh b/docker/restart.sh
index 65187bb..b239599 100644
--- a/docker/restart.sh
+++ b/docker/restart.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-/usr/local/bin/docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose.yml down
+/usr/local/bin/docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose-service.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 rmi $(/usr/local/bin/docker images -f "dangling=true" -q)
+/usr/local/bin/docker-compose -f /Users/zhaolu/Documents/pro2d/docker-compose-service.yml up -d
 /usr/local/bin/docker ps -a
+/usr/local/bin/docker rmi $(/usr/local/bin/docker images -f "dangling=true" -q)
diff --git a/docker/serverlist.yml b/docker/serverlist.yml
index 32db8ca..1172f3d 100644
--- a/docker/serverlist.yml
+++ b/docker/serverlist.yml
@@ -8,4 +8,9 @@ server_list:
     name: "西风一年"
     address: "192.168.0.100"
     gameport: 8849
+    gmport: 8880
+  - id: "3"
+    name: "叮当叮当"
+    address: "192.168.0.206"
+    gameport: 8849
     gmport: 8880
\ No newline at end of file
--
libgit2 0.21.2