From 95fb162641baaa96340abd8dee67e6394c823de5 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Sun, 10 Mar 2024 03:33:58 +0000 Subject: [PATCH] Chore: Release 2.9.1 --- README.md | 4 ++-- docs/bf2hub-bf2stats-example/README.md | 2 +- .../config/bf2/python/bf2/BF2StatisticsConfig-custom.py | 2 +- docs/bf2hub-bf2stats-example/docker-compose.yml | 8 ++++---- docs/full-bf2-stack-example/README.md | 2 +- .../config/bf2/python/bf2/BF2StatisticsConfig-custom.py | 2 +- docs/full-bf2-stack-example/docker-compose.yml | 8 ++++---- release.sh | 3 ++- src/ASP/bf2statistics.php | 2 +- src/ASP/index.php | 2 +- src/python/bf2/BF2StatisticsConfig.py | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 24b4dc2b..f32dc471 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,13 @@ Although BF2Statistics [`3.1.0`](https://github.com/BF2Statistics/ASP) has been `asp` image (for support environment variables, see [here](./src/ASP/system/config/config.php)): ```sh -docker run --rm -it -p 80:80 -e DB_HOST=db -e DB_PORT=3306 -e DB_NAME=bf2stats -e DB_USER=admin -e DB_PASS=admin startersclan/bf2stats:2.9.0-asp +docker run --rm -it -p 80:80 -e DB_HOST=db -e DB_PORT=3306 -e DB_NAME=bf2stats -e DB_USER=admin -e DB_PASS=admin startersclan/bf2stats:2.9.1-asp ``` `bf2sclone` image (for supported environment variables, see [here](./src/bf2sclone/config.inc.php)): ```sh -docker run --rm -it -p 80:80 -e DBIP=db -e DBNAME=bf2stats -e DBLOGIN=admin -e DBPASSWORD=admin startersclan/bf2stats:2.9.0-bf2sclone +docker run --rm -it -p 80:80 -e DBIP=db -e DBNAME=bf2stats -e DBLOGIN=admin -e DBPASSWORD=admin startersclan/bf2stats:2.9.1-bf2sclone ``` See [this](docs/full-bf2-stack-example) example showing how to deploy [Battlefield 2 1.5 server](https://github.com/startersclan/docker-bf2/), [PRMasterserver](https://github.com/startersclan/PRMasterServer) as the master server, and `bf2stats` as the stats web server, using `docker-compose`. diff --git a/docs/bf2hub-bf2stats-example/README.md b/docs/bf2hub-bf2stats-example/README.md index f43f2023..1fd069dd 100644 --- a/docs/bf2hub-bf2stats-example/README.md +++ b/docs/bf2hub-bf2stats-example/README.md @@ -42,7 +42,7 @@ Attaching to bf2stats-asp-1, bf2stats-bf2-1, bf2stats-bf2sclone-1, bf2stats-db-1 The stack is now running: -- Battlefield 2 1.5 server with `bf2stats` `2.9.0` support available on your external IP address on UDP ports `16567` and `29900` on your external IP address +- Battlefield 2 1.5 server with `bf2stats` `2.9.1` support available on your external IP address on UDP ports `16567` and `29900` on your external IP address - Gamespy server is BF2Hub. See https://www.bf2hub.com/servers/unranked to see your server listed (unranked because we are not an official BF2Hub "EA trusted partner") - `coredns` available on your external IP address on UDP port `53` on your external IP address - `traefik` (TLS-terminated reverse web proxy) available on port `80` and `443` on your external IP address diff --git a/docs/bf2hub-bf2stats-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py b/docs/bf2hub-bf2stats-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py index d332da5d..548e3591 100644 --- a/docs/bf2hub-bf2stats-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py +++ b/docs/bf2hub-bf2stats-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# BF2Statistics 2.9.0 - Config File +# BF2Statistics 2.9.1 - Config File # ------------------------------------------------------------------------------ # Conventions: # 0 -> Disable diff --git a/docs/bf2hub-bf2stats-example/docker-compose.yml b/docs/bf2hub-bf2stats-example/docker-compose.yml index fb19bdf2..a9cbd4e5 100644 --- a/docs/bf2hub-bf2stats-example/docker-compose.yml +++ b/docs/bf2hub-bf2stats-example/docker-compose.yml @@ -1,8 +1,8 @@ version: '2.2' services: - # Battlefield 2 1.5 server with bf2stats 2.9.0 python scripts + # Battlefield 2 1.5 server with bf2stats 2.9.1 python scripts bf2: - image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.9.0 + image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.9.1 volumes: - ./config/bf2/mods/bf2/ai/aidefault-custom.ai:/server/bf2/mods/bf2/ai/aidefault.ai:ro # Customize bots - ./config/bf2/mods/bf2/settings/serversettings-custom.con:/server/bf2/mods/bf2/settings/serversettings.con:ro # Server config @@ -81,7 +81,7 @@ services: # The gamespy ASP. The dashboard is available at https://asp.example.com/ASP asp: - image: startersclan/bf2stats:2.9.0-asp + image: startersclan/bf2stats:2.9.1-asp labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" @@ -126,7 +126,7 @@ services: # The bf2sclone for viewing BFHQ on the web. It is available at https://bf2sclone.example.com bf2sclone: - image: startersclan/bf2stats:2.9.0-bf2sclone + image: startersclan/bf2stats:2.9.1-bf2sclone labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" diff --git a/docs/full-bf2-stack-example/README.md b/docs/full-bf2-stack-example/README.md index c2369107..7cfad739 100644 --- a/docs/full-bf2-stack-example/README.md +++ b/docs/full-bf2-stack-example/README.md @@ -61,7 +61,7 @@ Attaching to bf2stats-asp-1, bf2stats-bf2-1, bf2stats-bf2sclone-1, bf2stats-core The full stack is now running: -- Battlefield 2 1.5 server with `bf2stats` `2.9.0` support available on your external IP address on UDP ports `16567` and `29900` on your external IP address +- Battlefield 2 1.5 server with `bf2stats` `2.9.1` support available on your external IP address on UDP ports `16567` and `29900` on your external IP address - Gamespy server [`PRMasterServer`](https://github.com/PRMasterServer) available at your external IP address on TCP ports `29900`, `29901`, `28910`, and UDP ports `27900` and `29910` on your external IP address - `coredns` available on your external IP address on UDP port `53` on your external IP address - `traefik` (TLS-terminated reverse web proxy) available on port `80` and `443` on your external IP address diff --git a/docs/full-bf2-stack-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py b/docs/full-bf2-stack-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py index d332da5d..548e3591 100644 --- a/docs/full-bf2-stack-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py +++ b/docs/full-bf2-stack-example/config/bf2/python/bf2/BF2StatisticsConfig-custom.py @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# BF2Statistics 2.9.0 - Config File +# BF2Statistics 2.9.1 - Config File # ------------------------------------------------------------------------------ # Conventions: # 0 -> Disable diff --git a/docs/full-bf2-stack-example/docker-compose.yml b/docs/full-bf2-stack-example/docker-compose.yml index ed116728..b739d0e2 100644 --- a/docs/full-bf2-stack-example/docker-compose.yml +++ b/docs/full-bf2-stack-example/docker-compose.yml @@ -1,8 +1,8 @@ version: '2.2' services: - # Battlefield 2 1.5 server with bf2stats 2.9.0 python scripts + # Battlefield 2 1.5 server with bf2stats 2.9.1 python scripts bf2: - image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.9.0 + image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.9.1 volumes: - ./config/bf2/mods/bf2/ai/aidefault-custom.ai:/server/bf2/mods/bf2/ai/aidefault.ai:ro # Customize bots - ./config/bf2/mods/bf2/settings/serversettings-custom.con:/server/bf2/mods/bf2/settings/serversettings.con:ro # Server config @@ -125,7 +125,7 @@ services: # The gamespy ASP. The dashboard is available at https://asp.example.com/ASP asp: - image: startersclan/bf2stats:2.9.0-asp + image: startersclan/bf2stats:2.9.1-asp labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" @@ -170,7 +170,7 @@ services: # The bf2sclone for viewing BFHQ on the web. It is available at https://bf2sclone.example.com bf2sclone: - image: startersclan/bf2stats:2.9.0-bf2sclone + image: startersclan/bf2stats:2.9.1-bf2sclone labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" diff --git a/release.sh b/release.sh index be238139..c04bb415 100755 --- a/release.sh +++ b/release.sh @@ -19,10 +19,11 @@ if ! echo "$TAG_PREV" | grep -E "$TAG_REGEX" > /dev/null; then echo "Previous git tag is invalid. It does not match regex: $TAG_REGEX" exit 1 fi +TAG_PREV_REGEX=$( echo "$TAG_PREV" | sed 's/\./\\./g' ) # '1.0.0' -> '1\.0\.0' # Update version in docs, .php, and .sql files git ls-files | grep -E '(README.md|docker-compose.yml|BF2StatisticsConfig.*\.py|src/ASP/index\.php|src/ASP/bf2statistics\.php)' | while read -r l; do - sed -i "s/$TAG_PREV/$TAG/g" "$l" + sed -i "s/$TAG_PREV_REGEX/$TAG/g" "$l" done echo "Done bumping version to $TAG in all files." diff --git a/src/ASP/bf2statistics.php b/src/ASP/bf2statistics.php index bce2181c..340f2500 100644 --- a/src/ASP/bf2statistics.php +++ b/src/ASP/bf2statistics.php @@ -23,7 +23,7 @@ | Define Constants | --------------------------------------------------------------- */ - define('CODE_VER', '2.9.0'); + define('CODE_VER', '2.9.1'); define('CODE_VER_DATE', '2013-03-12'); define('TIME_START', microtime(1)); define('DS', DIRECTORY_SEPARATOR); diff --git a/src/ASP/index.php b/src/ASP/index.php index c6a4deb1..8909e1b9 100644 --- a/src/ASP/index.php +++ b/src/ASP/index.php @@ -24,7 +24,7 @@ | --------------------------------------------------------------- */ define('BF2_ADMIN', 1); - define('CODE_VER', '2.9.0'); + define('CODE_VER', '2.9.1'); define('CODE_VER_DATE', '2013-03-12'); define('DS', DIRECTORY_SEPARATOR); define('ROOT', dirname(__FILE__)); diff --git a/src/python/bf2/BF2StatisticsConfig.py b/src/python/bf2/BF2StatisticsConfig.py index 8f0286c6..cf55185b 100644 --- a/src/python/bf2/BF2StatisticsConfig.py +++ b/src/python/bf2/BF2StatisticsConfig.py @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# BF2Statistics 2.9.0 - Config File +# BF2Statistics 2.9.1 - Config File # ------------------------------------------------------------------------------ # Conventions: # 0 -> Disable