Merge pull request #1 from jkuettner/fix/multiple-gameservers

Fix multiple gameservers

README.md

@@ -16,13 +16,13 @@ The easiest way to start your own BFBC2 LAN-Server is to use [docker-compose](ht
 docker-compose up -d
 ```
 
-this command will start up both servers with default configurations.
+this command will start up the master-server and two game-servers (ruah and sqdm) with default configurations.
 
 alternatively you can run the docker-images manually:
 
 ```sh
 # master-server
-docker run \
+docker run -t \
     -d --net=host \
     quay.io/docker-gameserver/bfbc2-master-server
 
@@ -49,7 +49,7 @@ To enable persistence you have to create a local database folder and mount it to
 
 ```sh
 mkdir ./database
-docker run \
+docker run -t \
     -d --net=host \
     -v "./database:/home/bfbc2/database" \
     quay.io/docker-gameserver/bfbc2-master-server
@@ -100,6 +100,10 @@ docker run \
     quay.io/docker-gameserver/bfbc2-server
 ```
 
+## Multiple Game-Server
+
+make sure that you have unique `SERVER_PORT` and `SERVER_ADMIN_PORT` env variables set per server instance.
+
 # Build
 
 Naturally you do not have to use the pre-build images from docker-hub. Simply build your own images:

docker-compose.yaml

@@ -2,17 +2,20 @@ version: "3"
 
 services:
 
-  bfbc2-master-server:
+  master-server:
     image: quay.io/docker-gameserver/bfbc2-master-server
-    # build: ./master-server
+    #build: ./master-server
+    restart: always
     network_mode: "host"
+    tty: true # for real-time output
     volumes:
       - "./database:/home/bfbc2/database"
     #   - "./custom-config.ini:/home/bfbc2/config.ini"
 
-  bfbc2-server:
+  rush-server:
     image: quay.io/docker-gameserver/bfbc2-server
-    # build: ./game-server
+    #build: ./game-server
+    restart: always
     network_mode: "host"
     environment:
       MASTER_SERVER: "127.0.0.1"
@@ -22,3 +25,18 @@ services:
       SERVER_ADMIN_PORT: 48888
       SERVER_ADMIN_PASSWORD: "langaming"
       SERVER_MAX_PLAYERS: 8
+
+  sqdm-server:
+    image: quay.io/docker-gameserver/bfbc2-server
+    #build: ./game-server
+    restart: always
+    network_mode: "host"
+    environment:
+      MASTER_SERVER: "127.0.0.1"
+      SERVER_TYPE: "sqdm"
+      SERVER_NAME: "SQDM LAN-Server"
+      SERVER_PORT: 19568
+      SERVER_ADMIN_PORT: 48889
+      SERVER_ADMIN_PASSWORD: "langaming"
+      SERVER_MAX_PLAYERS: 8
+

game-server/Dockerfile

@@ -23,8 +23,8 @@ USER bfbc2
 ENV WINEARCH=win32 \
     WINEPREFIX="/home/bfbc2/.wine32"
 
-RUN wineboot \
-    && xvfb-run winetricks -q \
+RUN xvfb-run -e /dev/stdout -a -s "-nolisten tcp -screen 0 1280x1024x24" wineboot \
+    && xvfb-run -e /dev/stdout -a -s "-nolisten tcp -screen 0 1280x1024x24" winetricks -q \
         dinput8 \
         vcrun2005 \
         vcrun2008 \

game-server/bin/run.sh

@@ -8,7 +8,7 @@ cat <<EOF >bfbc2.ini
 host=${MASTER_SERVER}
 connect_to_retail=0
 executable_type=auto
-show_console=0
+show_console=1
 
 [client]
 reroute_http=0
@@ -56,16 +56,15 @@ function start_bfbc2_server() {
     write_config "${SERVER_PATH}"
 
     echo "Starting ${SERVER_MODE} server ..."
+    rm -f "${SERVER_PATH}maplist.txt"
     ln -s "/home/bfbc2/server/maplists/${MAPLIST_PATH}" "${SERVER_PATH}maplist.txt"
 
-    sleep 1
-
-    xvfb-run wine "Frost.Game.Main_Win32_Final.exe" \
+    xvfb-run -e /dev/stdout -a -s "-nolisten tcp -screen 0 1280x1024x24" wine "Frost.Game.Main_Win32_Final.exe" \
         -serverInstancePath "${SERVER_PATH}" \
         -mapPack2Enabled 1 \
         -timeStampLogNames \
         -region OC \
-        -heartBeatInterval 20000 
+        -heartBeatInterval 20000
 }
 
 shopt -s nocasematch

game-server/maplists/conquest.txt

@@ -1,13 +1,13 @@
 CONQUEST
-levels/nam_mp_007cq
-levels/mp_001
-levels/mp_003
-levels/mp_005
-levels/mp_006cq
-levels/mp_007
-levels/mp_008cq
-levels/mp_009cq
-levels/mp_012cq
-levels/bc1_oasis_cq
-levels/bc1_harvest_day_cq
-levels/mp_sp_005cq
+levels/nam_mp_007cq         # Operation Hastings
+levels/mp_001               # Panama Canal
+levels/mp_003               # Laguna Alta
+levels/mp_005               # Atacama Desert
+levels/mp_006cq             # Arica Harbour
+levels/mp_007               # White Pass
+levels/mp_008cq             # Nelson Bay
+levels/mp_009cq             # Laguna Presa
+levels/mp_012cq             # Port Valdez
+levels/bc1_oasis_cq         # Oasis
+levels/bc1_harvest_day_cq   # Harvest Day
+levels/mp_sp_005cq          # Heavy Metal

game-server/maplists/rush.txt

@@ -1,12 +1,12 @@
 RUSH
-Levels/MP_002 0
-Levels/MP_004 0
-Levels/MP_005GR 0
-Levels/MP_006 0
-Levels/MP_007GR 0
-Levels/MP_008 0
-Levels/MP_009GR 0
-Levels/MP_012GR 0
-Levels/BC1_Oasis_GR 0
-Levels/BC1_Harvest_Day_GR 0
-Levels/MP_SP_002GR 0
+levels/mp_002			    # Valparaiso
+levels/MP_004			    # Isla Inocentes
+levels/mp_005gr 		    # Atacama Desert 
+levels/mp_006			    # Arica Harbour
+levels/mp_007gr	    	    # White Pass
+levels/mp_008			    # Nelson Bay
+levels/mp_009gr		        # Laguna Presa
+levels/mp_012gr		        # Port Valdez
+levels/mp_sp_002gr		    # Cold War
+levels/bc1_harvest_day_gr	# Harvest Day
+levels/bc1_oasis_gr		    # Oasis

game-server/maplists/sqdm.txt

@@ -1,12 +1,9 @@
 SQDM
-levels/nam_mp_007sdm
-levels/mp_001sdm
-levels/mp_004sdm
-levels/mp_006sdm
-levels/mp_007sdm
-levels/mp_008sdm
-levels/mp_009sdm
-levels/bc1_oasis_sdm
-levels/bc1_harvest_day_sdm
-levels/mp_sp_002sdm
-levels/mp_sp_005sdm
+levels/mp_006sdm            # Arica Harbour
+levels/bc1_harvest_day_sdm  # Harvest Day
+levels/mp_sp_005sdm         # Heavy Metal
+levels/mp_004sdm            # Isla Inocentes
+levels/mp_009sdm            # Laguna Presa
+levels/mp_008sdm            # Nelson Bay
+levels/bc1_oasis_sdm        # Oasis
+levels/mp_007sdm            # White Pass

game-server/maplists/sqrush.txt

@@ -1,11 +1,9 @@
 SQRUSH
-levels/nam_mp_007sr
-levels/mp_001sr
-levels/mp_002sr
-levels/mp_003sr
-levels/mp_005sr
-levels/mp_009sr
-levels/mp_012sr
-levels/bc1_oasis_sr
-levels/bc1_harvest_day_sr
-levels/mp_sp_002sr
+levels/mp_sp_002sr          # Cold War
+levels/bc1_harvest_day_sr   # Harvest Day
+levels/mp_003sr             # Laguna Alta
+levels/mp_009sr             # Laguna Presa
+levels/bc1_oasis_sr         # Oasis
+levels/mp_001sr             # Panama Canal
+levels/mp_012sr             # Port Valdez
+levels/mp_002sr             # Valparaiso

game-server/maplists/viet_conquest.txt

@@ -1,5 +1,6 @@
 CONQUEST
-levels/nam_mp_002cq
-levels/nam_mp_003cq
-levels/nam_mp_005cq
-levels/nam_mp_006cq
+levels/nam_mp_002cq # Vantage Point
+levels/nam_mp_003cq # Hill 137
+levels/nam_mp_005cq # Cai Son Temple
+levels/nam_mp_006cq # Phu Bai Valley
+levels/nam_mp_007cq # Operation Hastings

game-server/maplists/viet_rush.txt

@@ -1,5 +1,6 @@
 RUSH
-levels/nam_mp_002r
-levels/nam_mp_003r
-levels/nam_mp_005r
-levels/nam_mp_006r
+levels/nam_mp_002r # Vantage Point
+levels/nam_mp_003r # Hill 137
+levels/nam_mp_005r # Cai Son Temple
+levels/nam_mp_006r # Phu Bai Valley
+levels/nam_mp_007r # Operation Hastings

game-server/maplists/viet_sqdm.txt

@@ -1,5 +1,6 @@
 SQDM
-levels/nam_mp_002sdm
-levels/nam_mp_003sdm
-levels/nam_mp_005sdm
-levels/nam_mp_006sdm
+levels/nam_mp_002sdm # Vantage Point
+levels/nam_mp_003sdm # Hill 137
+levels/nam_mp_005sdm # Cai Son Temple
+levels/nam_mp_006sdm # Phu Bai Valley
+levels/nam_mp_007sdm # Operation Hastings

game-server/maplists/viet_sqrush.txt

@@ -1,5 +1,6 @@
 SQRUSH
-levels/nam_mp_002sr
-levels/nam_mp_003sr 
-levels/nam_mp_005sr 
-levels/nam_mp_006sr
+levels/nam_mp_002sr # Vantage Point
+levels/nam_mp_003sr # Hill 137 
+levels/nam_mp_005sr # Cai Son Temple 
+levels/nam_mp_006sr # Phu Bai Valley
+levels/nam_mp_007sr # Operation Hastings