From 60fa1d48f06bf51b091608c069248dac789c88c6 Mon Sep 17 00:00:00 2001 From: Lucas Briese Date: Fri, 28 Sep 2018 14:50:39 +0200 Subject: [PATCH] + basic server working, docker stop not catched --- entrypoint.sh | 19 +++++-- garrysmod.cfg | 139 -------------------------------------------------- server.log | 99 ----------------------------------- 3 files changed, 15 insertions(+), 242 deletions(-) delete mode 100644 garrysmod.cfg delete mode 100644 server.log diff --git a/entrypoint.sh b/entrypoint.sh index a8d1c01..3c38212 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -24,6 +24,7 @@ echo "install & mount gamefiles" ./installAndMountAddons.sh cd "$STEAM_PATH" +#docker args -> lgsm args export parms="-game garrysmod +gamemode terrortown "$(printf "%s " "$@") if [ -e "${STEAM_PATH}/lgsm/config-lgsm/gmodserver/gmodserver.cfg" ]; then rm -f "${STEAM_PATH}/lgsm/config-lgsm/gmodserver/gmodserver.cfg" @@ -35,8 +36,18 @@ echo "parms="'"'"$parms"'"' >> "${STEAM_PATH}/lgsm/config-lgsm/gmodserver/gmodse echo "}" >> "${STEAM_PATH}/lgsm/config-lgsm/gmodserver/gmodserver.cfg" echo "starting with $parms" -trap 'pkill -15 srcds_linux' SIGTERM -#trap "cd ${STEAM_PATH} && ./gmodserver stop" SIGTERM +#force fetch of command_console.sh +if [ ! -e "${STEAM_PATH}/lgsm/functions/command_console.sh" ]; then + wget -O "${STEAM_PATH}/lgsm/functions/command_console.sh" "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/master/lgsm/functions/command_console.sh" + chmod +x "${STEAM_PATH}/lgsm/functions/command_console.sh" +fi +#skip confirmation +sed -i 's/! fn_prompt_yn "Continue?" Y/[ "1" != "1" ]/' "${STEAM_PATH}/lgsm/functions/command_console.sh" + +#start server ./gmodserver start -./gmodserver console & -wait "$!" + +#trap & show console +trap 'pkill -15 srcds_run' SIGTERM +./gmodserver console +# If in background created and wait "$!" => terminal never started -> container exit right after diff --git a/garrysmod.cfg b/garrysmod.cfg deleted file mode 100644 index 77a0ef0..0000000 --- a/garrysmod.cfg +++ /dev/null @@ -1,139 +0,0 @@ -#### Server Settings #### - -## Server Start Settings | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters -ip="0.0.0.0" -port="27015" -clientport="27005" -sourcetvport="27020" -defaultmap="gm_construct" -maxplayers="16" -tickrate="66" -gamemode="sandbox" - -## Workshop Parameters | https://wiki.garrysmod.com/page/Workshop_for_Dedicated_Servers -# To get an API key visit - https://steamcommunity.com/dev/apikey -wsapikey="" -wscollectionid="" - -## Custom Start Parameters -# Default -disableluarefresh, disables lua autorefresh reducing server lag. Auto refresh only useful for developers. -customparms="-disableluarefresh" - -## Optional: Game Server Login Token -# GSLT can be used for running a public server. -# More info: https://linuxgsm.com/gslt -gslt="" - -## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters -fn_parms(){ -parms="-game garrysmod -strictportbind -ip ${ip} -port ${port} -tickrate ${tickrate} +host_workshop_collection ${wscollectionid} -authkey ${wsapikey} +clientport ${clientport} +tv_port ${sourcetvport} +gamemode ${gamemode} +map ${defaultmap} +sv_setsteamaccount ${gslt} +servercfgfile ${servercfg} -maxplayers ${maxplayers} ${customparms}" -} - -#### LinuxGSM Settings #### - -## Notification Alerts -# (on|off) - -# More info | https://github.com/GameServerManagers/LinuxGSM/wiki/Alerts#more-info -postalert="off" -postdays="7" -posttarget="https://hastebin.com" - -# Discord Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Discord -discordalert="off" -discordwebhook="webhook" - -# Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Email -emailalert="off" -email="email@example.com" -emailfrom="" - -# IFTTT Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/IFTTT -iftttalert="off" -ifttttoken="accesstoken" -iftttevent="linuxgsm_alert" - -# Mailgun Email Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/mailgun -mailgunalert="off" -mailguntoken="accesstoken" -mailgundomain="example.com" -mailgunemailfrom="alert@example.com" -mailgunemail="email@myemail.com" - -# Pushbullet Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet -pushbulletalert="off" -pushbullettoken="accesstoken" -channeltag="" - -# Pushover Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Pushover -pushoveralert="off" -pushovertoken="accesstoken" - -# Telegram Alerts | https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram -# You can add a custom cURL string eg proxy (useful in Russia) or else in "curlcustomstring". -# like a "--socks5 ipaddr:port" for socks5 proxy see more in "curl --help", if you not need -# any custom string in curl - simple ignore this parameter. -telegramalert="off" -telegramtoken="accesstoken" -telegramchatid="" -curlcustomstring="" - -## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update -updateonstart="off" - -## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup -maxbackups="4" -maxbackupdays="30" -stoponbackup="on" - -## Logging | https://github.com/GameServerManagers/LinuxGSM/wiki/Logging -consolelogging="on" -logdays="7" - -#### LinuxGSM Advanced Settings #### - -# ANSI Colors -ansi="on" - -## SteamCMD Settings -# Server appid -appid="4020" -# Steam App Branch Select -# Allows to opt into the various Steam app branches. Default branch is "". -# Example: "-beta latest_experimental" -branch="" - -## LinuxGSM Server Details -# Do not edit -gamename="Garry's Mod" -engine="source" - -#### Directories #### -# Edit with care - -## Server Specific Directories -systemdir="${serverfiles}/garrysmod" -addonsdir="${systemdir}/addons" -executabledir="${serverfiles}" -executable="./srcds_run" -servercfg="${servicename}.cfg" -servercfgdefault="server.cfg" -servercfgdir="${systemdir}/cfg" -servercfgfullpath="${servercfgdir}/${servercfg}" - -## Backup Directory -backupdir="${rootdir}/backups" - -## Logging Directories -logdir="${rootdir}/log" -gamelogdir="${systemdir}/logs" -lgsmlogdir="${logdir}/script" -consolelogdir="${logdir}/console" -lgsmlog="${lgsmlogdir}/${servicename}-script.log" -consolelog="${consolelogdir}/${servicename}-console.log" -alertlog="${lgsmlogdir}/${servicename}-alert.log" -postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log" - -## Logs Naming -lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log" -consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log" \ No newline at end of file diff --git a/server.log b/server.log deleted file mode 100644 index 5e61684..0000000 --- a/server.log +++ /dev/null @@ -1,99 +0,0 @@ -steamcmd.sh -linux32/steamcmd -linux32/steamerrorreporter -linux32/libstdc++.so.6 -linux32/crashhandler.so -testing steamcmd -Redirecting stderr to '/root/Steam/logs/stderr.txt' -ILocalize::AddFile() failed to load file "public/steambootstrapper_english.txt". -[ 0%] Checking for available update... -[----] Downloading update (0 of 13269 KB)... -[ 0%] Downloading update (2216 of 13269 KB)... -[ 16%] Downloading update (4052 of 13269 KB)... -[ 30%] Downloading update (5413 of 13269 KB)... -[ 40%] Downloading update (6772 of 13269 KB)... -[ 51%] Downloading update (8287 of 13269 KB)... -[ 62%] Downloading update (9636 of 13269 KB)... -[ 72%] Downloading update (11143 of 13269 KB)... -[ 83%] Downloading update (12490 of 13269 KB)... -[ 94%] Downloading update (13269 of 13269 KB)... -[100%] Download Complete. -[----] Applying update... -[----] Extracting package... -[----] Extracting package... -[----] Extracting package... -[----] Installing update... -[----] Installing update... -[----] Installing update... -[----] Installing update... -[----] Cleaning up... -[----] Update complete, launching... -Redirecting stderr to '/root/Steam/logs/stderr.txt' -[ 0%] Checking for available updates... -[----] Verifying installation... -Steam Console Client (c) Valve Corporation --- type 'quit' to exit -- -Loading Steam API...OK. - -Connecting anonymously to Steam Public...Logged in OK -Waiting for user info...OK -installing / validating ttt -Redirecting stderr to '/root/Steam/logs/stderr.txt' -[ 0%] Checking for available updates... -[----] Verifying installation... -Steam Console Client (c) Valve Corporation --- type 'quit' to exit -- -Loading Steam API...OK. - -Connecting anonymously to Steam Public...Logged in OK -Waiting for user info...OK - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x3) reconfiguring, progress: 0.00 (0 / 0) - Update state (0x5) validating, progress: 0.89 (34757008 / 3924934088) - Update state (0x5) validating, progress: 7.64 (299890423 / 3924934088) - Update state (0x5) validating, progress: 16.32 (640371691 / 3924934088) - Update state (0x5) validating, progress: 24.56 (963981343 / 3924934088) - Update state (0x5) validating, progress: 30.54 (1198644216 / 3924934088) - Update state (0x5) validating, progress: 36.89 (1447868608 / 3924934088) - Update state (0x5) validating, progress: 46.11 (1809783357 / 3924934088) - Update state (0x5) validating, progress: 55.57 (2180952591 / 3924934088) - Update state (0x5) validating, progress: 64.09 (2515628671 / 3924934088) - Update state (0x5) validating, progress: 73.42 (2881645453 / 3924934088) - Update state (0x5) validating, progress: 81.38 (3194205334 / 3924934088) - Update state (0x5) validating, progress: 90.54 (3553826494 / 3924934088) - Update state (0x5) validating, progress: 99.15 (3891452699 / 3924934088) -Success! App '4020' fully installed. -starting with --game garrysmod +maxplayers 12 +map gm_flatgrass -debug --game garrysmod +maxplayers 12 +map gm_flatgrass -debug - - -************** WARNING *************** -Running the dedicated server as root -is highly discouraged. It is generally -unnecessary to use root privileges to -execute the dedicated server. -************************************** - - -Auto detecting CPUntinue to launch in 1 secondss -Using default binary: ./srcds_linux -Enabling debug mode -Server will auto-restart if there is a crash. -Setting breakpad minidump AppID = 4000 -[S_API FAIL] SteamAPI_Init() failed; SteamAPI_IsSteamRunning() failed. -[S_API FAIL] SteamAPI_Init() failed; SteamAPI_IsSteamRunning() failed. \ No newline at end of file