From 002b9b117db7ebc457a677df0f48a12ae8df6634 Mon Sep 17 00:00:00 2001 From: Lars Olzem Date: Fri, 17 Aug 2018 02:49:09 +0100 Subject: [PATCH] update build process --- Dockerfile | 29 +++++++++++++ README.md | 7 ---- {minimal/cfg => cfg}/mount.cfg | 0 {minimal/cfg => cfg}/mountdepots.txt | 0 latest/Dockerfile | 63 ---------------------------- latest/cfg/mount.cfg | 19 --------- latest/cfg/mountdepots.txt | 11 ----- latest/cfg/sandbox.cfg | 4 -- latest/cfg/server.cfg | 3 -- latest/cfg/terrortown.cfg | 4 -- minimal/Dockerfile | 61 --------------------------- minimal/cfg/sandbox.cfg | 4 -- minimal/cfg/server.cfg | 3 -- minimal/cfg/terrortown.cfg | 4 -- 14 files changed, 29 insertions(+), 183 deletions(-) create mode 100644 Dockerfile rename {minimal/cfg => cfg}/mount.cfg (100%) rename {minimal/cfg => cfg}/mountdepots.txt (100%) delete mode 100644 latest/Dockerfile delete mode 100644 latest/cfg/mount.cfg delete mode 100644 latest/cfg/mountdepots.txt delete mode 100644 latest/cfg/sandbox.cfg delete mode 100644 latest/cfg/server.cfg delete mode 100644 latest/cfg/terrortown.cfg delete mode 100644 minimal/Dockerfile delete mode 100644 minimal/cfg/sandbox.cfg delete mode 100644 minimal/cfg/server.cfg delete mode 100644 minimal/cfg/terrortown.cfg diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..219f917 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +FROM hackebein/srcds + +ENV APPS="4020" \ + TICKRATE="66" \ + MAXPLAYERS="16" \ + #http://steamcommunity.com/dev/apikey + AUTHKEY="" \ + WORKSHOPCOLLECTIONID="" \ + # sandbox or terrortown + GAMEMODE="sandbox" \ + MAP="gm_flatgrass" \ + #http://steamcommunity.com/dev/managegameservers APPID: 4000 + GLST="" \ + CONFIG="server.cfg" \ + CUSTOMPARAMETERS="" \ + SRCDSPARAMS="\ + -game garrysmod \ + -tickrate ${TICKRATE} \ + -maxplayers ${MAXPLAYERS} \ + -authkey ${AUTHKEY} \ + +host_workshop_collection ${WORKSHOPCOLLECTIONID} \ + +gamemode ${GAMEMODE} \ + +map ${MAP} \ + +sv_setsteamaccount ${GLST} \ + +servercfgfile ${CONFIG} \ + ${CUSTOMPARAMETERS} \ + " + +COPY cfg $BASEDIR/garrysmod/cfg \ No newline at end of file diff --git a/README.md b/README.md index 4efab18..7ba5543 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,3 @@ -# Supported tags and respective `Dockerfile` links - -* `minimal` [(minimal/Dockerfile)](https://github.com/Hackebein/docker-garrysmod/blob/master/minimal/Dockerfile) -* `latest` [(latest/Dockerfile)](https://github.com/Hackebein/docker-garrysmod/blob/master/latest/Dockerfile) -* ~~`full` (full/Dockerfile).~~ coming soon -* ~~`beta` (beta/Dockerfile).~~ coming soon - # What is Garry's Mod? Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play. diff --git a/minimal/cfg/mount.cfg b/cfg/mount.cfg similarity index 100% rename from minimal/cfg/mount.cfg rename to cfg/mount.cfg diff --git a/minimal/cfg/mountdepots.txt b/cfg/mountdepots.txt similarity index 100% rename from minimal/cfg/mountdepots.txt rename to cfg/mountdepots.txt diff --git a/latest/Dockerfile b/latest/Dockerfile deleted file mode 100644 index ae04e17..0000000 --- a/latest/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -FROM hackebein/steamcmd:latest - -ARG BASEDIR=/opt/garrysmod -ONBUILD ARG BASEDIR=$BASEDIR - -ENV BASEDIR=$BASEDIR \ - PORT="27015" \ - TICKRATE="66" \ - MAXPLAYERS="16" \ - #http://steamcommunity.com/dev/apikey - AUTHKEY="" \ - WORKSHOPCOLLECTIONID="" \ - CLIENTPORT="27005" \ - # sandbox or terrortown - GAMEMODE="sandbox" \ - MAP="gm_flatgrass" \ - #http://steamcommunity.com/dev/managegameservers APPID: 4000 - GLST="" \ - CONFIG="${GAMEMODE}.cfg" \ - CUSTOMPARAMETERS="" - -RUN apt-get update -q \ - && apt-get install -yqq lib32tinfo5 paxctl \ - && apt-get clean \ - && rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - && /usr/games/steamcmd \ - +login anonymous \ - +force_install_dir $BASEDIR \ - # cstrike - +app_update 232330 -validate -language en \ - # garrysmod - +app_update 4020 -validate -language en \ - +quit \ - && rm -rf $BASEDIR/garrysmod/cfg/* \ - && paxctl -cm "$BASEDIR/srcds_linux" - -COPY cfg $BASEDIR/garrysmod/cfg - -WORKDIR $BASEDIR - -EXPOSE 27015/udp - -CMD [ \ - "sh", \ - "-c", \ - "$BASEDIR/srcds_run \ - -game garrysmod \ - -strictportbind \ - -port ${PORT} \ - -tickrate ${TICKRATE} \ - -maxplayers ${MAXPLAYERS} \ - -authkey ${AUTHKEY} \ - +host_workshop_collection ${WORKSHOPCOLLECTIONID} \ - +clientport ${CLIENTPORT} \ - +gamemode ${GAMEMODE} \ - +map ${MAP} \ - +sv_setsteamaccount ${GLST} \ - +servercfgfile ${CONFIG} \ - ${CUSTOMPARAMETERS}" \ - ] \ No newline at end of file diff --git a/latest/cfg/mount.cfg b/latest/cfg/mount.cfg deleted file mode 100644 index b1b19cd..0000000 --- a/latest/cfg/mount.cfg +++ /dev/null @@ -1,19 +0,0 @@ - -// -// Use this file to mount additional paths to the filesystem -// DO NOT add a slash to the end of the filename -// - -"mountcfg" -{ - "cstrike" "cstrike" - //"hl1" "" - //"hl1_hd" "" - //"hl2" "" - //"hl2mp" "" - //"episodic" "" - //"ep2" "" - //"lostcoast" "" -} - - diff --git a/latest/cfg/mountdepots.txt b/latest/cfg/mountdepots.txt deleted file mode 100644 index 4f93ee6..0000000 --- a/latest/cfg/mountdepots.txt +++ /dev/null @@ -1,11 +0,0 @@ -"gamedepotsystem" -{ - "cstrike" "1" - //"hl1" "1" - //"hl1_hd" "1" - //"hl2" "1" - //"hl2mp" "1" - //"episodic" "1" - //"ep2" "1" - //"lostcoast" "1" -} \ No newline at end of file diff --git a/latest/cfg/sandbox.cfg b/latest/cfg/sandbox.cfg deleted file mode 100644 index a05b90e..0000000 --- a/latest/cfg/sandbox.cfg +++ /dev/null @@ -1,4 +0,0 @@ -// Garry's Mod - sandbox - Config -// https://github.com/garrynewman/garrysmod/blob/master/garrysmod/gamemodes/sandbox/sandbox.txt -exec server.cfg -exec my.sandbox.cfg \ No newline at end of file diff --git a/latest/cfg/server.cfg b/latest/cfg/server.cfg deleted file mode 100644 index 0a4391c..0000000 --- a/latest/cfg/server.cfg +++ /dev/null @@ -1,3 +0,0 @@ -// Garry's Mod - Config -// https://developer.valvesoftware.com/wiki/Console_Command_List -exec my.server.cfg \ No newline at end of file diff --git a/latest/cfg/terrortown.cfg b/latest/cfg/terrortown.cfg deleted file mode 100644 index 1ab13d9..0000000 --- a/latest/cfg/terrortown.cfg +++ /dev/null @@ -1,4 +0,0 @@ -// Garry's Mod - terrortown - Config -// https://github.com/garrynewman/garrysmod/blob/master/garrysmod/gamemodes/terrortown/terrortown.txt -exec server.cfg -exec my.terrortown.cfg \ No newline at end of file diff --git a/minimal/Dockerfile b/minimal/Dockerfile deleted file mode 100644 index e141711..0000000 --- a/minimal/Dockerfile +++ /dev/null @@ -1,61 +0,0 @@ -FROM hackebein/steamcmd:latest - -ARG BASEDIR=/opt/garrysmod -ONBUILD ARG BASEDIR=$BASEDIR - -ENV BASEDIR=$BASEDIR \ - PORT="27015" \ - TICKRATE="66" \ - MAXPLAYERS="16" \ - #http://steamcommunity.com/dev/apikey - AUTHKEY="" \ - WORKSHOPCOLLECTIONID="" \ - CLIENTPORT="27005" \ - # sandbox or terrortown - GAMEMODE="sandbox" \ - MAP="gm_flatgrass" \ - #http://steamcommunity.com/dev/managegameservers APPID: 4000 - GLST="" \ - CONFIG="${GAMEMODE}.cfg" \ - CUSTOMPARAMETERS="" - -RUN apt-get update -q \ - && apt-get install -yqq lib32tinfo5 paxctl \ - && apt-get clean \ - && rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - && /usr/games/steamcmd \ - +login anonymous \ - +force_install_dir $BASEDIR \ - # garrysmod - +app_update 4020 -validate -language en \ - +quit \ - && rm -rf $BASEDIR/garrysmod/cfg/* \ - && paxctl -cm "$BASEDIR/srcds_linux" - -COPY cfg $BASEDIR/garrysmod/cfg - -WORKDIR $BASEDIR - -EXPOSE 27015/udp - -CMD [ \ - "sh", \ - "-c", \ - "$BASEDIR/srcds_run \ - -game garrysmod \ - -strictportbind \ - -port ${PORT} \ - -tickrate ${TICKRATE} \ - -maxplayers ${MAXPLAYERS} \ - -authkey ${AUTHKEY} \ - +host_workshop_collection ${WORKSHOPCOLLECTIONID} \ - +clientport ${CLIENTPORT} \ - +gamemode ${GAMEMODE} \ - +map ${MAP} \ - +sv_setsteamaccount ${GLST} \ - +servercfgfile ${CONFIG} \ - ${CUSTOMPARAMETERS}" \ - ] \ No newline at end of file diff --git a/minimal/cfg/sandbox.cfg b/minimal/cfg/sandbox.cfg deleted file mode 100644 index a05b90e..0000000 --- a/minimal/cfg/sandbox.cfg +++ /dev/null @@ -1,4 +0,0 @@ -// Garry's Mod - sandbox - Config -// https://github.com/garrynewman/garrysmod/blob/master/garrysmod/gamemodes/sandbox/sandbox.txt -exec server.cfg -exec my.sandbox.cfg \ No newline at end of file diff --git a/minimal/cfg/server.cfg b/minimal/cfg/server.cfg deleted file mode 100644 index 0a4391c..0000000 --- a/minimal/cfg/server.cfg +++ /dev/null @@ -1,3 +0,0 @@ -// Garry's Mod - Config -// https://developer.valvesoftware.com/wiki/Console_Command_List -exec my.server.cfg \ No newline at end of file diff --git a/minimal/cfg/terrortown.cfg b/minimal/cfg/terrortown.cfg deleted file mode 100644 index 1ab13d9..0000000 --- a/minimal/cfg/terrortown.cfg +++ /dev/null @@ -1,4 +0,0 @@ -// Garry's Mod - terrortown - Config -// https://github.com/garrynewman/garrysmod/blob/master/garrysmod/gamemodes/terrortown/terrortown.txt -exec server.cfg -exec my.terrortown.cfg \ No newline at end of file