Add various servers and rework caching solution

.gitignore

@@ -11,6 +11,7 @@ gamedata/
 /data
 wads/
 RemoteControlExamples/
-
-
+.cache/
+tmp/
 server_files/
+.cache

README.md

@@ -1,3 +1,4 @@
+# gameservers-docker
 
 Putting game servers in Docker containers. Because it makes life easier.
 
@@ -8,25 +9,29 @@ or sourcemod for srcds), making it almost one command to install a server.
 No binaries are stored in this repo, so make sure you have internet to
 download them with.
 
-Includes a utility script `start_server.sh` which mounts save data to an
-external volume and sorts out networking for you.
+Includes utility scripts:
+
+- `start_server.sh` - mounts save data to an external volume and sorts out networking for you
+- `docker_build.sh` - builds the specified list of containers. e.g. `docker_build.sh css,css-metamod,tf2`
 
 ## Quick start
 
 Assuming you are on a blank server with Git and docker installed:
 
 ```
 git clone https://github.com/OpenSourceLAN/gameservers-docker.git .
-./build.sh factorio
+```
+Check the game directory for existing templates and make your configurations before building.
+```
+./docker_build.sh factorio
 
 ./start_server.sh factorio
 # Or
 docker run -it --net=host -e "SERVER_NAME=Some really cool server"\
 -v `pwd`/save:`cat factorio/mounts` --name factorio factorio
-
 ```
 
-Most servers have environment variables that can be used to configure them.
+Most servers have environment variables that can be used to configure them after building them.
 Read the README.md file in each directory to see what is available.
 
 ## Tutorial
@@ -146,6 +151,13 @@ Make an easy way to import config files in to the servers (eg mounting cfg direc
 
 Add more games
 
+### Useful scripts
+
+- Remove container data
+```
+sudo rm -fr /var/lib/docker/containers && sudo mkdir containers && sudo chmod 700 containers
+```
+
 ### LICENSE
 
 This project is licensed under GPL 3.0. See LICENSE for more information.

base/Dockerfile

@@ -1,10 +1,27 @@
-FROM ubuntu:16.04
+ARG DISTRO="20.04"
+
+FROM ubuntu:${DISTRO}
+
 ARG TZ="Etc/UTC"
-RUN sed -i 's/archive.ubuntu.com/au.archive.ubuntu.com/' /etc/apt/sources.list
-RUN apt-get update  && apt-get dist-upgrade -y &&\
-	apt-get install -y unzip p7zip-full curl wget lib32gcc1 iproute2 vim-tiny bzip2 jq software-properties-common apt-transport-https lib32stdc++6 && \
-	apt-get clean
-RUN echo "$TZ" > /etc/timezone
-RUN  ln -fs /usr/share/zoneinfo/$TZ /etc/localtime
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+    && apt-get dist-upgrade -y \
+    && apt-get install -y \
+        git \
+        unzip \
+        p7zip-full\
+        curl\
+        wget\
+        lib32gcc1\
+        lib32stdc++6\
+        iproute2\
+        vim-tiny\
+        bzip2\
+        jq\
+        software-properties-common\
+        apt-transport-https\
+        rsync \
+    && apt-get clean
 
-# add to base install: 
+RUN echo "$TZ" > /etc/timezone \
+    && ln -fs /usr/share/zoneinfo/$TZ /etc/localtime

blackmesa/.dockerignore

@@ -0,0 +1,8 @@
+/config-templates
+Dockerfile
+README.md
+.cache-info
+.dockerignore
+.env
+.gitignore
+.git

blackmesa/.gitignore

@@ -0,0 +1 @@
+server.cfg

blackmesa/Dockerfile

@@ -0,0 +1,27 @@
+FROM steamcmd
+
+ENV GAME=mesa
+ENV APP_ID=346680
+
+WORKDIR /steam/${GAME}/
+
+USER root
+
+RUN chown -R steam /steam/${GAME}/
+USER steam
+
+RUN /steam/steamcmd_linux/steamcmd.sh +login anonymous +force_install_dir /steam/${GAME} +app_update ${APP_ID} +quit
+ARG CACHE_DATE
+RUN /steam/steamcmd_linux/steamcmd.sh +login anonymous +force_install_dir /steam/${GAME} +app_update ${APP_ID} +quit
+
+RUN mkdir -p /home/steam/.steam \
+    && mkdir -p /home/steam/.steam/sdk32 \
+    && ln -s /steam/steamcmd_linux/linux32/steamclient.so /home/steam/.steam/sdk32/steamclient.so
+
+COPY --chown=steam download.sh .
+RUN ./download.sh
+
+COPY --chown=steam start.sh .
+COPY --chown=steam server.cfg /steam/mesa/bms/cfg/server.cfg
+
+ENTRYPOINT ["./start.sh"]

blackmesa/config-templates/server.template.cfg

@@ -0,0 +1,12 @@
+// Black Mesa server.cfg file
+hostname "Black Mesa: LAN"
+mp_timelimit 3600
+mp_fraglimit 30
+mp_teamplay 1
+mp_forcerespawn 1
+//sv_password pass123
+//sv_always_run 1
+sv_cheats 1
+sourcecoop_difficulty_auto -1
+sourcecoop_difficulty 3
+sourcecoop_ft KEEP_EQUIPMENT 1

blackmesa/download.sh

@@ -0,0 +1,9 @@
+# https://www.sourcemm.net/
+wget https://mms.alliedmods.net/mmsdrop/1.12/mmsource-1.12.0-git1219-linux.tar.gz
+tar -xvzf mmsource-1.12.0-git1219-linux.tar.gz -C /steam/mesa/bms
+rm -f mmsource-1.12.0-git1219-linux.tar.gz
+
+# https://www.sourcemod.net/
+wget https://sm.alliedmods.net/smdrop/1.12/sourcemod-1.12.0-git7210-linux.tar.gz
+tar -xvzf sourcemod-1.12.0-git7210-linux.tar.gz -C /steam/mesa/bms
+rm -f sourcemod-1.12.0-git7210-linux.tar.gz

blackmesa/start.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# local vars
+[[ $LAN -ge 1 ]] && LAN="1" || LAN="0"
+[[ -z "$MAP" ]] && MAP="bm_c0a0a"
+[[ -z $MAXPLAYERS ]] && MAXPLAYERS="24"
+
+exec ./srcds_run -game bms +exec server.cfg +sv_lan $LAN +ip 0.0.0.0 +map $MAP -usercon -port 27015 -maxplayers $MAXPLAYERS -secure $OTHER_ARGS $@

cs1_6-wip/.dockerignore

@@ -0,0 +1,7 @@
+/config-templates
+Dockerfile
+README.md
+.dockerignore
+.env
+.gitignore
+.git

cs1_6-wip/Dockerfile

@@ -0,0 +1,33 @@
+FROM steamcmd
+
+ENV GAME=hlds
+
+WORKDIR /steam/${GAME}/
+
+USER root
+RUN chown -R steam /steam/${GAME}/
+USER steam
+
+RUN mkdir /steam/${GAME}/steamapps/
+WORKDIR /steam/${GAME}/steamapps/
+RUN for i in 10 70 90; do wget -q https://raw.githubusercontent.com/dgibbs64/HLDS-appmanifest/main/CounterStrike/appmanifest_$i.acf -O appmanifest_$i.acf; done
+WORKDIR /steam/${GAME}/
+
+RUN for i in 10 70 90; do /steam/steamcmd_linux/steamcmd.sh +login anonymous +force_install_dir /steam/${i} +app_update ${i} +quit
+ARG CACHE_DATE
+RUN for i in 10 70 90; do /steam/steamcmd_linux/steamcmd.sh +login anonymous +force_install_dir /steam/${i} +app_update ${i} +quit
+
+# figure out what this is doing
+# https://github.com/MartinHajducik/cs16ds/blob/main/Dockerfile
+
+COPY --chown=steam \
+    config/ \
+    configure.sh \
+    configure-base.sh \
+    generate-mapcycle.sh \
+    start.sh \
+    ./
+
+ENV SV_HOSTNAME="Counterstrike 1.6 (Base)"
+
+ENTRYPOINT ["./start.sh"]

cs1_6-wip/README.md

@@ -0,0 +1,47 @@
+# Counterstrike Source
+
+Counterstrike Source server without plugins.
+
+## Build notes
+To catch updates since the original image was built, run:
+
+ ```
+docker build --build-arg CACHE_DATE="$(date)"
+```
+
+This will re-use the previously built image as a base instead of re-downloading everything again.
+
+## Environment variables
+
+The following configuration is available via setting environment variables:
+
+```
+hostname $SV_HOSTNAME
+rcon_password $RCON_PASSWORD
+sv_password $SV_PASSWORD
+mp_friendlyfire $MP_FRIENDLYFIRE
+mp_timelimit $MP_TIMELIMIT
+mp_maxrounds $MP_MAXROUNDS
+mp_roundtime $MP_ROUNDTIME
+mp_autoteambalance $MP_AUTOTEAMBALANCE
+bot_quota $BOT_QUOTA
+bot_quota_mode $BOT_QUOTA_MODE
+bot_join_after_player $BOT_JOIN_AFTER_PLAYER
+bot_difficulty $BOT_DIFFICULTY
+bot_prefix $BOT_PREFIX
+bot_defer_to_human $BOT_DEFER_TO_HUMAN
+bot_auto_vacate $BOT_AUTO_VACATE
+bot_chatter $BOT_CHATTER
+bot_allow_grenades $BOT_ALLOW_GRENADES
+bot_allow_pistols $BOT_ALLOW_PISTOLS
+bot_allow_rifles $BOT_ALLOW_RIFLES
+bot_allow_rogues $BOT_ALLOW_ROGUES
+bot_allow_shotguns $BOT_ALLOW_SHOTGUNS
+bot_allow_snipers $BOT_ALLOW_SNIPERS
+bot_allow_machine_guns $BOT_ALLOW_MACHINE_GUNS
+bot_allow_sub_machine_guns $BOT_ALLOW_SUB_MACHINE_GUNS
+```
+## Troubleshooting
+
+### I can't see the LAN Server!
+* Try disabling `Automatic Metric` and entering `1` for your LAN/WiFi adapter

cs1_6-wip/config/cstrike/cfg/motd.txt

@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html>
+<head>
+<title>Cstrike MOTD</title>
+<style type="text/css">
+pre     {
+                font-family:Verdana,Tahoma;
+                color:#FFB000;
+        }
+body    {
+                background:#000000;
+                margin-left:8px;
+                margin-top:0px;
+                }
+a       {
+        text-decoration:    underline;
+        }
+a:link  {
+    color:  #FFFFFF;
+    }
+a:visited   {
+    color:  #FFFFFF;
+    }
+a:active    {
+    color:  #FFFFFF;
+    }
+a:hover {
+    color:  #FFFFFF;
+    text-decoration:    underline;
+    }
+</style>
+</head>
+<body scroll="no">
+<pre>
+You are playing Counter-Strike: Source
+Visit the official CS web site @
+www.counter-strike.net
+<a href="http://www.counter-strike.net">Visit Counter-Strike.net</a>
+</pre>
+</body>

cs1_6-wip/config/cstrike/cfg/motd_text.txt

@@ -0,0 +1,3 @@
+You are playing Counter-Strike: Source
+Visit the official CS web site @
+www.counter-strike.net