Skip to content

Commit

Permalink
Chore: Bump version to 2.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
leojonathanoh committed Jan 21, 2023
1 parent 2359c3e commit eaedf8f
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Although BF2Statistics [`3.1.0`](https://github.com/BF2Statistics/ASP) has been
## Usage

```sh
docker pull startersclan/bf2stats:2.3.3-asp-nginx
docker pull startersclan/bf2stats:2.3.3-asp-php
docker pull startersclan/bf2stats:2.3.3-bf2sclone-nginx
docker pull startersclan/bf2stats:2.3.3-bf2sclone-php
docker pull startersclan/bf2stats:2.3.4-asp-nginx
docker pull startersclan/bf2stats:2.3.4-asp-php
docker pull startersclan/bf2stats:2.3.4-bf2sclone-nginx
docker pull startersclan/bf2stats:2.3.4-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`.
Expand Down Expand Up @@ -115,11 +115,11 @@ docker volume rm bf2stats_db-volume
## Release

```sh
# Bump version across docs and source code
MOST_RECENT_TAG=$( git --no-pager tag -l --sort=-version:refname | head -n1 ) # E.g. 1.0.0
TAG=2.3.3 # E.g. 1.0.1
# Bump version across docs and source code
MOST_RECENT_TAG=$( git --no-pager tag -l --sort=-version:refname | head -n1 )
TAG=2.3.4
if [ -n "$MOST_RECENT_TAG" ]; then
git ls-files | grep -E '\.md|\.php|\.py|\.ya?ml' | while read -r l; do
git ls-files | grep -E '\.md|\.php|\.py|\.ya?ml' | while read -r l; do
sed -i "s/\b$MOST_RECENT_TAG\b/$TAG/g" "$l"
done
fi
Expand Down
2 changes: 1 addition & 1 deletion docs/bf2hub-bf2stats-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.3` 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.3.4` 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
# BF2Statistics 2.3.3 - Config File
# BF2Statistics 2.3.4 - Config File
# ------------------------------------------------------------------------------
# Conventions:
# 0 -> Disable
Expand Down
12 changes: 6 additions & 6 deletions docs/bf2hub-bf2stats-example/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '2.2'
services:
# Battlefield 2 1.5 server with bf2stats 2.3.3 python scripts
# Battlefield 2 1.5 server with bf2stats 2.3.4 python scripts
bf2:
image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.3.3
image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.3.4
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
Expand Down Expand Up @@ -109,7 +109,7 @@ services:
# The gamespy ASP. The dashboard is available at https://asp.example.com/ASP
asp-nginx:
image: startersclan/bf2stats:2.3.3-asp-nginx
image: startersclan/bf2stats:2.3.4-asp-nginx
labels:
- "traefik.enable=true"
- "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network"
Expand Down Expand Up @@ -143,7 +143,7 @@ services:
restart: unless-stopped

asp-php:
image: startersclan/bf2stats:2.3.3-asp-php
image: startersclan/bf2stats:2.3.4-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
Expand All @@ -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.3.3-bf2sclone-nginx
image: startersclan/bf2stats:2.3.4-bf2sclone-nginx
labels:
- "traefik.enable=true"
- "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network"
Expand All @@ -185,7 +185,7 @@ services:
restart: unless-stopped

bf2sclone-php:
image: startersclan/bf2stats:2.3.3-bf2sclone-php
image: startersclan/bf2stats:2.3.4-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
Expand Down
2 changes: 1 addition & 1 deletion docs/full-bf2-stack-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.3` 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.3.4` 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
# BF2Statistics 2.3.3 - Config File
# BF2Statistics 2.3.4 - Config File
# ------------------------------------------------------------------------------
# Conventions:
# 0 -> Disable
Expand Down
12 changes: 6 additions & 6 deletions docs/full-bf2-stack-example/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '2.2'
services:
# Battlefield 2 1.5 server with bf2stats 2.3.3 python scripts
# Battlefield 2 1.5 server with bf2stats 2.3.4 python scripts
bf2:
image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.3.3
image: startersclan/docker-bf2:v1.5.3153.0-bf2stats-2.3.4
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
Expand Down Expand Up @@ -154,7 +154,7 @@ services:
# The gamespy ASP. The dashboard is available at https://asp.example.com/ASP
asp-nginx:
image: startersclan/bf2stats:2.3.3-asp-nginx
image: startersclan/bf2stats:2.3.4-asp-nginx
labels:
- "traefik.enable=true"
- "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network"
Expand Down Expand Up @@ -185,7 +185,7 @@ services:
restart: unless-stopped

asp-php:
image: startersclan/bf2stats:2.3.3-asp-php
image: startersclan/bf2stats:2.3.4-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
Expand All @@ -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.3.3-bf2sclone-nginx
image: startersclan/bf2stats:2.3.4-bf2sclone-nginx
labels:
- "traefik.enable=true"
- "traefik.docker.network=${COMPOSE_PROJECT_NAME?err}_traefik-network"
Expand All @@ -227,7 +227,7 @@ services:
restart: unless-stopped

bf2sclone-php:
image: startersclan/bf2stats:2.3.3-bf2sclone-php
image: startersclan/bf2stats:2.3.4-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
Expand Down
2 changes: 1 addition & 1 deletion src/ASP/bf2statistics.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
| Define Constants
| ---------------------------------------------------------------
*/
define('CODE_VER', '2.3.3');
define('CODE_VER', '2.3.4');
define('CODE_VER_DATE', '2013-03-12');
define('TIME_START', microtime(1));
define('DS', DIRECTORY_SEPARATOR);
Expand Down
2 changes: 1 addition & 1 deletion src/ASP/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
| ---------------------------------------------------------------
*/
define('BF2_ADMIN', 1);
define('CODE_VER', '2.3.3');
define('CODE_VER', '2.3.4');
define('CODE_VER_DATE', '2013-03-12');
define('DS', DIRECTORY_SEPARATOR);
define('ROOT', dirname(__FILE__));
Expand Down
2 changes: 1 addition & 1 deletion src/python/bf2/BF2StatisticsConfig.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
# BF2Statistics 2.3.3 - Config File
# BF2Statistics 2.3.4 - Config File
# ------------------------------------------------------------------------------
# Conventions:
# 0 -> Disable
Expand Down

0 comments on commit eaedf8f

Please sign in to comment.