From 360a40791761d97bdcd00bfd0a31391df8989252 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Tue, 31 Jan 2023 21:46:44 +0000 Subject: [PATCH] Chore: Bump version to `2.5.0` --- README.md | 10 +++++----- docs/bf2hub-bf2stats-example/README.md | 2 +- .../bf2/python/bf2/BF2StatisticsConfig-custom.py | 2 +- docs/bf2hub-bf2stats-example/docker-compose.yml | 12 ++++++------ docs/full-bf2-stack-example/README.md | 2 +- .../bf2/python/bf2/BF2StatisticsConfig-custom.py | 2 +- docs/full-bf2-stack-example/docker-compose.yml | 12 ++++++------ src/ASP/bf2statistics.php | 2 +- src/ASP/index.php | 2 +- src/python/bf2/BF2StatisticsConfig.py | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 66cc6542..6acdfd30 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ Although BF2Statistics [`3.1.0`](https://github.com/BF2Statistics/ASP) has been ## Usage ```sh -docker pull startersclan/bf2stats:2.4.5-asp-nginx -docker pull startersclan/bf2stats:2.4.5-asp-php -docker pull startersclan/bf2stats:2.4.5-bf2sclone-nginx -docker pull startersclan/bf2stats:2.4.5-bf2sclone-php +docker pull startersclan/bf2stats:2.5.0-asp-nginx +docker pull startersclan/bf2stats:2.5.0-asp-php +docker pull startersclan/bf2stats:2.5.0-bf2sclone-nginx +docker pull startersclan/bf2stats:2.5.0-bf2sclone-php ``` 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`. @@ -116,7 +116,7 @@ docker volume rm bf2stats_db-volume ```sh # Bump version across docs and source code MOST_RECENT_TAG_REGEX=$( git --no-pager tag -l --sort=-version:refname | head -n1 | sed 's@\.@\\.@g' ) -TAG=2.4.5 +TAG=2.5.0 git ls-files | grep -E '(^docker-compose.yml|^README.md|^docs/|index.php|bf2statistics.php|BF2StatisticsConfig.py)' | while read -r l; do sed -i "s/\b$MOST_RECENT_TAG_REGEX\b/$TAG/g" "$l"; done git checkout -b "chore/bump-version-to-$TAG" git add . diff --git a/docs/bf2hub-bf2stats-example/README.md b/docs/bf2hub-bf2stats-example/README.md index 0061b89c..7580a19a 100644 --- a/docs/bf2hub-bf2stats-example/README.md +++ b/docs/bf2hub-bf2stats-example/README.md @@ -44,7 +44,7 @@ Attaching to bf2stats-asp-nginx-1, bf2stats-asp-php-1, bf2stats-bf2-1, bf2stats- The stack is now running: -- Battlefield 2 1.5 server with `bf2stats` `2.4.5` 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.5.0` 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 bb209cb1..e0eec0fb 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.4.5 - Config File +# BF2Statistics 2.5.0 - Config File # ------------------------------------------------------------------------------ # Conventions: # 0 -> Disable diff --git a/docs/bf2hub-bf2stats-example/docker-compose.yml b/docs/bf2hub-bf2stats-example/docker-compose.yml index 47e02214..c54d716a 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.4.5 python scripts + # Battlefield 2 1.5 server with bf2stats 2.5.0 python scripts bf2: - image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.4.5 + image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.5.0 volumes: - ./config/bf2/mods/bf2/ai/aidefault-custom.ai:/server/bf2/mods/bf2/ai/aidefault.ai:ro # Customize bots - ./config/bf2/mods/bf2/ai/aibehaviours-fixlookatwrapper.ai:/server/bf2/mods/bf2/ai/aibehaviours.ai:ro # LoopAtWrapper fix @@ -109,7 +109,7 @@ services: # The gamespy ASP. The dashboard is available at https://asp.example.com/ASP asp-nginx: - image: startersclan/bf2stats:2.4.5-asp-nginx + image: startersclan/bf2stats:2.5.0-asp-nginx labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" @@ -143,7 +143,7 @@ services: restart: unless-stopped asp-php: - image: startersclan/bf2stats:2.4.5-asp-php + image: startersclan/bf2stats:2.5.0-asp-php volumes: - ./config/ASP/config.php:/src/ASP/system/config/config.php # Main config file. Must be writeable or else ASP will throw an exception. Customize only if needed # - ./config/ASP/php/conf.d/php.ini:/usr/local/etc/php/conf.d/php.ini:ro # Customize only if needed @@ -159,7 +159,7 @@ services: # The bf2sclone for viewing BFHQ on the web. It is available at https://bf2sclone.example.com bf2sclone-nginx: - image: startersclan/bf2stats:2.4.5-bf2sclone-nginx + image: startersclan/bf2stats:2.5.0-bf2sclone-nginx labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" @@ -185,7 +185,7 @@ services: restart: unless-stopped bf2sclone-php: - image: startersclan/bf2stats:2.4.5-bf2sclone-php + image: startersclan/bf2stats:2.5.0-bf2sclone-php volumes: - ./config/bf2sclone/config.inc.php:/src/bf2sclone/config.inc.php:ro # Main config file. Customize as needed # - ./config/bf2sclone/php/conf.d/php.ini:/usr/local/etc/php/conf.d/php.ini:ro # Customize only if needed diff --git a/docs/full-bf2-stack-example/README.md b/docs/full-bf2-stack-example/README.md index 9fd91991..07201085 100644 --- a/docs/full-bf2-stack-example/README.md +++ b/docs/full-bf2-stack-example/README.md @@ -63,7 +63,7 @@ Attaching to bf2stats-asp-nginx-1, bf2stats-asp-php-1, bf2stats-bf2-1, bf2stats- The full stack is now running: -- Battlefield 2 1.5 server with `bf2stats` `2.4.5` 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.5.0` 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 bb209cb1..e0eec0fb 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.4.5 - Config File +# BF2Statistics 2.5.0 - 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 859298e5..f1ec10ef 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.4.5 python scripts + # Battlefield 2 1.5 server with bf2stats 2.5.0 python scripts bf2: - image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.4.5 + image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.5.0 volumes: - ./config/bf2/mods/bf2/ai/aidefault-custom.ai:/server/bf2/mods/bf2/ai/aidefault.ai:ro # Customize bots - ./config/bf2/mods/bf2/ai/aibehaviours-fixlookatwrapper.ai:/server/bf2/mods/bf2/ai/aibehaviours.ai:ro # LoopAtWrapper fix @@ -154,7 +154,7 @@ services: # The gamespy ASP. The dashboard is available at https://asp.example.com/ASP asp-nginx: - image: startersclan/bf2stats:2.4.5-asp-nginx + image: startersclan/bf2stats:2.5.0-asp-nginx labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" @@ -185,7 +185,7 @@ services: restart: unless-stopped asp-php: - image: startersclan/bf2stats:2.4.5-asp-php + image: startersclan/bf2stats:2.5.0-asp-php volumes: - ./config/ASP/config.php:/src/ASP/system/config/config.php # Main config file. Must be writeable or else ASP will throw an exception. Customize only if needed # - ./config/ASP/php/conf.d/php.ini:/usr/local/etc/php/conf.d/php.ini:ro # Customize only if needed @@ -201,7 +201,7 @@ services: # The bf2sclone for viewing BFHQ on the web. It is available at https://bf2sclone.example.com bf2sclone-nginx: - image: startersclan/bf2stats:2.4.5-bf2sclone-nginx + image: startersclan/bf2stats:2.5.0-bf2sclone-nginx labels: - "traefik.enable=true" - "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network" @@ -227,7 +227,7 @@ services: restart: unless-stopped bf2sclone-php: - image: startersclan/bf2stats:2.4.5-bf2sclone-php + image: startersclan/bf2stats:2.5.0-bf2sclone-php volumes: - ./config/bf2sclone/config.inc.php:/src/bf2sclone/config.inc.php:ro # Main config file. Customize as needed # - ./config/bf2sclone/php/conf.d/php.ini:/usr/local/etc/php/conf.d/php.ini:ro # Customize only if needed diff --git a/src/ASP/bf2statistics.php b/src/ASP/bf2statistics.php index 891bb581..61c1f749 100644 --- a/src/ASP/bf2statistics.php +++ b/src/ASP/bf2statistics.php @@ -23,7 +23,7 @@ | Define Constants | --------------------------------------------------------------- */ - define('CODE_VER', '2.4.5'); + define('CODE_VER', '2.5.0'); 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 f8b5119a..44e50daa 100644 --- a/src/ASP/index.php +++ b/src/ASP/index.php @@ -24,7 +24,7 @@ | --------------------------------------------------------------- */ define('BF2_ADMIN', 1); - define('CODE_VER', '2.4.5'); + define('CODE_VER', '2.5.0'); 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 34c1be89..672d87e9 100644 --- a/src/python/bf2/BF2StatisticsConfig.py +++ b/src/python/bf2/BF2StatisticsConfig.py @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# BF2Statistics 2.4.5 - Config File +# BF2Statistics 2.5.0 - Config File # ------------------------------------------------------------------------------ # Conventions: # 0 -> Disable