Skip to content

Commit

Permalink
release: 2.1.4.fix1
Browse files Browse the repository at this point in the history
  • Loading branch information
1995chen committed May 25, 2024
1 parent be94e5c commit a3e8d54
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
containers:
- name: dnf
imagePullPolicy: IfNotPresent
image: 1995chen/dnf:centos5-2.1.4
image: 1995chen/dnf:centos5-2.1.4.fix1
ports:
- name: mysql
containerPort: 3306
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ For cooperation and suggestions please contact [email protected] or yzd3
## 2.1.5 Release Plan
```shell
1.支持假人
2.支持一款流行的网页GM_Tool
3.通过插件支持几款登陆器
2.通过插件支持几款登陆器
```

## 自动化构建
Expand Down Expand Up @@ -97,10 +96,10 @@ https://www.cnblogs.com/EasonJim/p/7777904.html
以下命令三选一

```shell
docker pull 1995chen/dnf:centos5-2.1.4
docker pull 1995chen/dnf:centos6-2.1.4
docker pull 1995chen/dnf:centos5-2.1.4.fix1
docker pull 1995chen/dnf:centos6-2.1.4.fix1
如何您需要使用centos7作为基础镜像的特殊需求,可以使用:
docker pull 1995chen/dnf:centos7-2.1.4
docker pull 1995chen/dnf:centos7-2.1.4.fix1
所有镜像版本列表请参考[记得点赞三连,帮助更多的人了解该镜像]:
https://hub.docker.com/repository/docker/1995chen/dnf
```
Expand All @@ -118,7 +117,7 @@ mkdir -p /data/log /data/mysql /data/data
# DNF_DB_ROOT_PASSWORD为mysql root密码,容器启动是root密码会跟随该环境变量的变化自动更新
# WEB_USER为supervisor web管理页面用户名
# WEB_PASS为supervisor web管理页面密码(可以访问PUBLIC_IP:2000来访问进程管理页面)
docker run -d -e PUBLIC_IP=x.x.x.x -e WEB_USER=root -e WEB_PASS=123456 -e DNF_DB_ROOT_PASSWORD=88888888 -e GM_ACCOUNT=gmuser -e GM_PASSWORD=gmpass -v /data/log:/home/neople/game/log -v /data/mysql:/var/lib/mysql -v /data/data:/data -p 2000:180 -p 3000:3306/tcp -p 7600:7600/tcp -p 881:881/tcp -p 7001:7001/tcp -p 7001:7001/udp -p 10011:10011/tcp -p 11011:11011/udp -p 10052:10052/tcp -p 11052:11052/udp -p 7200:7200/tcp -p 7200:7200/udp -p 2311-2313:2311-2313/udp --privileged=true --cap-add=NET_ADMIN --hostname=dnf --cpus=1 --memory=1g --memory-swap=-1 --shm-size=8g --name=dnf 1995chen/dnf:centos5-2.1.4
docker run -d -e PUBLIC_IP=x.x.x.x -e WEB_USER=root -e WEB_PASS=123456 -e DNF_DB_ROOT_PASSWORD=88888888 -e GM_ACCOUNT=gmuser -e GM_PASSWORD=gmpass -v /data/log:/home/neople/game/log -v /data/mysql:/var/lib/mysql -v /data/data:/data -p 2000:180 -p 3000:3306/tcp -p 7600:7600/tcp -p 881:881/tcp -p 7001:7001/tcp -p 7001:7001/udp -p 10011:10011/tcp -p 11011:11011/udp -p 10052:10052/tcp -p 11052:11052/udp -p 7200:7200/tcp -p 7200:7200/udp -p 2311-2313:2311-2313/udp --privileged=true --cap-add=NET_ADMIN --hostname=dnf --cpus=1 --memory=1g --memory-swap=-1 --shm-size=8g --name=dnf 1995chen/dnf:centos5-2.1.4.fix1
```

## docker-compose部署[群晖推荐]
Expand Down
2 changes: 1 addition & 1 deletion UpdateChannel.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ docker stop dnf
docker rm dnf
# 启动docker容器
# 11022:11022/udp参数,来开放10022频道端口
docker run -d -e PUBLIC_IP=x.x.x.x -e WEB_USER=root -e WEB_PASS=123456 -e DNF_DB_ROOT_PASSWORD=88888888 -e GM_ACCOUNT=gmuser -e GM_PASSWORD=gmpass -v /data/log:/home/neople/game/log -v /data/mysql:/var/lib/mysql -v /data/data:/data -p 2000:180 -p 3000:3306/tcp -p 7600:7600/tcp -p 881:881/tcp -p 7001:7001/tcp -p 7001:7001/udp -p 10011:10011/tcp -p 11011:11011/udp -p 10022:10022/tcp -p 11022:11022/udp -p 10052:10052/tcp -p 11052:11052/udp -p 7200:7200/tcp -p 7200:7200/udp -p 2311-2313:2311-2313/udp --privileged=true --cap-add=NET_ADMIN --hostname=dnf --cpus=1 --memory=1g --memory-swap=-1 --shm-size=8g --name=dnf 1995chen/dnf:centos5-2.1.4
docker run -d -e PUBLIC_IP=x.x.x.x -e WEB_USER=root -e WEB_PASS=123456 -e DNF_DB_ROOT_PASSWORD=88888888 -e GM_ACCOUNT=gmuser -e GM_PASSWORD=gmpass -v /data/log:/home/neople/game/log -v /data/mysql:/var/lib/mysql -v /data/data:/data -p 2000:180 -p 3000:3306/tcp -p 7600:7600/tcp -p 881:881/tcp -p 7001:7001/tcp -p 7001:7001/udp -p 10011:10011/tcp -p 11011:11011/udp -p 10022:10022/tcp -p 11022:11022/udp -p 10052:10052/tcp -p 11052:11052/udp -p 7200:7200/tcp -p 7200:7200/udp -p 2311-2313:2311-2313/udp --privileged=true --cap-add=NET_ADMIN --hostname=dnf --cpus=1 --memory=1g --memory-swap=-1 --shm-size=8g --name=dnf 1995chen/dnf:centos5-2.1.4.fix1
```
这里启动命令我们新增了-p 10022:10022/tcp -p 11022:11022/udp,该参数的作用就是映射新的频道端口。
如果你开的是33频道,拿对应的端口参数就是:-p 10033:10033/tcp -p 11033:11033/udp。
2 changes: 1 addition & 1 deletion deploy/dnf/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:

dnf:
hostname: dnf
image: 1995chen/dnf:centos5-2.1.4
image: 1995chen/dnf:centos5-2.1.4.fix1
privileged: true
cap_add:
- NET_ADMIN
Expand Down
3 changes: 3 additions & 0 deletions plugin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# 申明

本目录下插件需要docker镜像版本达到2.1.4.fix1或更高版本!!!
2 changes: 1 addition & 1 deletion plugin/dnf-console/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ docker rm dnf
## 重新启动
我们将8088端口映射后,用新的启动命令启动,假设我们使用882端口,那么启动命令如下:
```shell
docker run -d -e PUBLIC_IP=x.x.x.x -e WEB_USER=root -e WEB_PASS=123456 -e DNF_DB_ROOT_PASSWORD=88888888 -e GM_ACCOUNT=gmuser -e GM_PASSWORD=gmpass -v /data/log:/home/neople/game/log -v /data/mysql:/var/lib/mysql -v /data/data:/data -p 2000:180 -p 3000:3306/tcp -p 7600:7600/tcp -p 881:881/tcp -p 882:8088/tcp -p 7001:7001/tcp -p 7001:7001/udp -p 10011:10011/tcp -p 11011:11011/udp -p 10052:10052/tcp -p 11052:11052/udp -p 7200:7200/tcp -p 7200:7200/udp -p 2311-2313:2311-2313/udp --privileged=true --cap-add=NET_ADMIN --hostname=dnf --cpus=1 --memory=1g --memory-swap=-1 --shm-size=8g --name=dnf 1995chen/dnf:centos5-2.1.4
docker run -d -e PUBLIC_IP=x.x.x.x -e WEB_USER=root -e WEB_PASS=123456 -e DNF_DB_ROOT_PASSWORD=88888888 -e GM_ACCOUNT=gmuser -e GM_PASSWORD=gmpass -v /data/log:/home/neople/game/log -v /data/mysql:/var/lib/mysql -v /data/data:/data -p 2000:180 -p 3000:3306/tcp -p 7600:7600/tcp -p 881:881/tcp -p 882:8088/tcp -p 7001:7001/tcp -p 7001:7001/udp -p 10011:10011/tcp -p 11011:11011/udp -p 10052:10052/tcp -p 11052:11052/udp -p 7200:7200/tcp -p 7200:7200/udp -p 2311-2313:2311-2313/udp --privileged=true --cap-add=NET_ADMIN --hostname=dnf --cpus=1 --memory=1g --memory-swap=-1 --shm-size=8g --name=dnf 1995chen/dnf:centos5-2.1.4.fix1
```
3 changes: 3 additions & 0 deletions plugin/dp2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
## 版本信息
dp2.9.0+frida_240418

## 镜像版本要求
dp2插件需要docker镜像版本>=2.1.4.fix1

## 如何使用
将本目录下的dp2.tgz复制到/data/data/dp目录下,然后手动解压dp2.tgz。
解压后目录结构如下:
Expand Down

0 comments on commit a3e8d54

Please sign in to comment.