diff --git a/.gitignore b/.gitignore index dbfda45..87ef70a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ data/ .ki-workspace/ +backups/ +dockernet-inspector.v1.sh +script.sh diff --git a/docker-compose.yml b/docker-compose.yml index b94eb8a..1642875 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,16 +13,19 @@ services: - "${SERVER_PORT:-2350}:${SERVER_PORT:-2350}/tcp" - "${SERVER_PORT:-2350}:${SERVER_PORT:-2350}/udp" - "${SERVER_P2P_PORT:-3450}:${SERVER_P2P_PORT:-3450}/tcp" - - "80:80/tcp" + - "16080:80/tcp" + - "3450:3450/udp" env_file: - .env + dns: + - 1.1.1.1 volumes: - ./data/gamedata:/opt/tmserver/GameData - ./data/controlpanel:/var/www/html - ./data/xaseco:/opt/tmserver/xaseco networks: tmserver_net: - ipv4_address: 172.20.60.10 + ipv4_address: 172.20.72.10 mariadb: image: mariadb:11.4 @@ -51,10 +54,10 @@ services: start_period: 30s networks: tmserver_net: - ipv4_address: 172.20.60.11 + ipv4_address: 172.20.72.11 ip-watcher: - image: alpine:3.21 + image: alpine:3.24 container_name: tmserver-ip-watcher restart: unless-stopped depends_on: @@ -67,7 +70,7 @@ services: - ./assets/bin/WatchPublicIP.sh:/opt/WatchPublicIP.sh:ro networks: tmserver_net: - ipv4_address: 172.20.60.12 + ipv4_address: 172.20.72.12 networks: tmserver_net: @@ -75,6 +78,6 @@ networks: driver: bridge ipam: config: - - subnet: 172.20.60.0/25 - gateway: 172.20.60.1 - ip_range: 172.20.60.64/26 + - subnet: 172.20.72.0/25 + gateway: 172.20.72.1 + ip_range: 172.20.72.64/26