Merge pull request #17 from Project-Unison/dev

TF2Classic-Docker 12.1

Author: RoonMoonlight

.github/workflows/docker-image.yml

@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "bookworm" ]
+    branches: [ "bookworm-core" ]
   pull_request:
-    branches: [ "bookworm" ]
+    branches: [ "bookworm-core" ]
 
 jobs:
 

.github/workflows/docker-publish.yml

@@ -9,11 +9,11 @@ on:
   schedule:
     - cron: '40 16 * * *'
   push:
-    branches: [ "bookworm" ]
+    branches: [ "bookworm-core" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
-    branches: [ "bookworm" ]
+    branches: [ "bookworm-core" ]
 
 env:
   # Use docker.io for Docker Hub if empty

Dockerfile

@@ -1,24 +1,26 @@
 # ----------------------------------
-# Pterodactyl Panel Dockerfile
-# Environment: Team Fortress 2 Classic
+# TF2Classic-Docker - A modification of pterodactyl's dockerfile.
+# Originally created by Pterodactyl, Modified by sapphonie and Roon
+# Some codes brought from https://github.com/joshuafhiggins/TF2-Classic, thank you!
+# Environment: TF2 Classic
 # ----------------------------------
 FROM        debian:bookworm-slim
 
-LABEL       author="Pterodactyl Software - edited by sapphonie and Roon" maintainer="https://github.com/RoonMoonlight"
+LABEL       author="Pterodactyl Software, sapphonie, Roon" maintainer="https://github.com/RoonMoonlight"
 
 ENV         DEBIAN_FRONTEND noninteractive
 ENV         TERM screen
 
 # Upgrade our base system first
-RUN         tput setaf 2; echo "TF2C Docker Script 12 'Bookworm' by Roon - a modification of Pterodactyl Docker File by Pterodactyl Software and sapphonie"; echo "Upgrading base image..."; tput sgr0; \
-            apt-get update \
-            && apt-get upgrade -y --no-install-recommends
+RUN         tput setaf 2; echo "TF2Classic-Docker 12.1 'Dark Cat' - A modification of pterodactyl's dockerfile by Roon. Originally created by Pterodactyl Software and sapphonie"; echo "Upgrading base image..."; tput sgr0; \
+            apt update \
+            && apt upgrade -y --no-install-recommends
 
 # from postgressql - set up en_US.UTF8 locale so srcds doesn't whine
 # https://github.com/docker-library/postgres/blob/69bc540ecfffecce72d49fa7e4a46680350037f9/9.6/Dockerfile#L21-L24
 RUN         tput setaf 2; echo "Setting en_US.UTF8 locale..."; tput sgr0; \
-            apt-get update \
-            && apt-get install -y locales \
+            apt update \
+            && apt install -y locales \
             && rm -rf /var/lib/apt/lists/* \
             && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
@@ -27,16 +29,16 @@ ENV         LANG en_US.utf8
 # install deps
 RUN         tput setaf 2; echo "Installing dependencies..."; tput sgr0; \
             dpkg --add-architecture i386 \
-            && apt-get update \
-            && apt-get install -y --no-install-recommends \ 
+            && apt update \
+            && apt install -y --no-install-recommends \ 
             # needed for ip route stuff in entrypoint.sh
             net-tools iproute2 \
-            # For TF2C dependencies
-            unzip aria2 lib32z1 libncurses5:i386 libbz2-1.0:i386 lib32gcc-s1 lib32stdc++6 libtinfo5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libcurl4-gnutls-dev libcurl4-gnutls-dev:i386 libxcb1 libxcb1:i386 \
+            # For SRCDS dependencies
+            lib32z1 libbz2-1.0:i386 lib32gcc-s1 lib32stdc++6 libncurses5:i386 libsdl2-2.0-0:i386 lib32stdc++6 libtinfo5:i386 libcurl4-gnutls-dev:i386 \
             # needed for some sourcemod extensions
             curl wget libcurl4:i386 \
             # helpful tools
-            python3 valgrind gdb tmux nano \
+            python3 valgrind gdb tmux nano software-properties-common \
             # needed for steamcmd
             ca-certificates
 
@@ -56,3 +58,9 @@ WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         ["/bin/bash", "/entrypoint.sh"]
+
+# Expose ports
+EXPOSE      27015/tcp \
+            27015/udp \
+            27020/udp
+

README.md

@@ -1,18 +1,15 @@
-# ⚠️ Notice: Podman support is dropped ⚠️
-**As of August 16, 2023, Podman support is dropped due to several issues that prevents me from using it and Docker is known to be widely used for production use. Podman should work as intended but NO support will be given regardless of the result. I advise you to use the Docker instead of podman. Thanks for understanding!**
 
-# Source Engine Docker Container
+# TF2Classic Docker Container
 [Pterodactyl Panel](https://pterodactyl.io/) docker source engine image, originally forked from [their upstream](https://github.com/parkervcp/images/tree/ubuntu/source), but cleaned up and converted to use debian-slim and less dependencies, saving ~300MB per server instance.
 
-This is modification of @sapphonie's srcds Dockerfiles, originally designed for TF2C compatibility but expanded with more features.
+This is modification of @sapphonie's srcds Dockerfiles, with TF2 Classic compatibility.
 
 Note: this container can run bash if no args are passed or if `bash` is passed in the startup options.
 
 ## Difference with sapphonie's Dockerfiles
-* Supports most Source Engine servers. Source 2 support is planned in the future.
 * Compatible with latest Debian-slim releases.
 * Adds useful tools `tmux` and `nano` included by default.
-* Adds [Team Fortress 2 Classic](https://tf2classic.com) support.
+* Designed for [Team Fortress 2 Classic](https://tf2classic.com) support.
 
 ## Requirements
 * Any Linux server distros
@@ -21,21 +18,19 @@ Note: this container can run bash if no args are passed or if `bash` is passed i
 ## How to use
 Due to trouble with Docker Desktop, we use [GitHub Docker Packages](https://github.com/features/packages) for automated creation.
 
+### Use with Docker
+As of Dec 15 2023, the core version is deprecated and will no longer receive any updates to focus more on TF2Classic.
+
 To allow anyone to join your server, don't forget to expose your port (By default it is 27015 but can be changed) before creating the docker instances. Using the rcon is highly discouraged so only UDP ports are allowed, but if you are okay with rcon, remove `/udp` after the port to allow rcon access.
 
 ### Use with Docker
 #### For most Source Engine servers
 ```
-docker run -it --name srcdsserver -p 27015:27015/udp --restart unless-stopped ghcr.io/roonmoonlight/srcds-tf2c-debian:bookworm-core
-```
-
-#### For Team Fortress 2 Classic servers
-```
-docker run -it --name tf2cserver -p 27015:27015/udp --restart unless-stopped ghcr.io/roonmoonlight/srcds-tf2c-debian:bookworm
+docker run -it --name tf2cserver --restart unless-stopped ghcr.io/roonmoonlight/srcds-tf2c-debian:latest
 ```
 
 ## Note
-* This Docker scripts only prepares every dependencies to install any Source Games Server, and does NOT automatically install server. Please refer to each game's Documentations for installation. For easier alternatives, using LinuxGSM's [docker-gameserver](https://github.com/GameServerManagers/docker-gameserver) is highly recommended.
+* This Docker scripts only prepares every dependencies to install TF2Classic Server, and does NOT automatically install server. Please refer to [official installation guide](https://wiki.tf2classic.com/wiki/Dedicated_Linux_server) for detailed instruction.
 
 ## License
 This project is licensed under MIT License.