Skip to content

Commit

Permalink
Merge pull request #77 from leojonathanoh/docs/docker-add-clarity-fo-…
Browse files Browse the repository at this point in the history
…upgrade-docs

Docs (docker): Add clarity fo upgrade docs
  • Loading branch information
leojonathanoh authored Nov 29, 2023
2 parents 98063b6 + 9e345cd commit 0e901d5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ services:
- "traefik.http.routers.${COMPOSE_PROJECT_NAME?err}-asp-gamespy-http.rule=Host(`bf2web.gamespy.com`)" # Note: `bf2web.gamespy.com` doesn't need https. The BF2 client BFHQ makes a HTTP requests to `bf2web.gamespy.com` with `Host: bf2web.gamespy.com`.
environment:
# - XDEBUG_MODE=off # Uncomment to disable xdebug
# See ./src/ASP/system/config/config.php for all supported env vars
# See ./src/ASP/system/config/config.php for all supported env vars. Use comma-delimited value for array
- DB_HOST=db
- DB_PORT=3306
- DB_NAME=bf2stats
Expand Down
2 changes: 1 addition & 1 deletion docs/full-bf2-stack-example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ services:
- "traefik.http.routers.${COMPOSE_PROJECT_NAME?err}-asp.rule=Host(`asp.example.com`)"
- "traefik.http.services.${COMPOSE_PROJECT_NAME?err}-asp.loadbalancer.server.port=80"
environment:
# See ./src/ASP/system/config/config.php for all supported env vars
# See ./src/ASP/system/config/config.php for all supported env vars. Use comma-delimited value for array
- DB_HOST=db
- DB_PORT=3306
- DB_NAME=bf2stats
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrading-docker-images-to-3.3.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Benefits:

These steps are demonstrated using Docker Compose.

1. Merge the networks and volumes of `asp-nginx` and `asp-php` into a single `asp` container, switch to a volume and env vars for `asp` configuration, and remove `depends_on`.
1. Merge the networks and volumes of `asp-nginx` and `asp-php` into a single `asp` container, switch to env vars and a volume for `asp` configuration, and remove `depends_on`.

For instance, from this:

Expand Down

0 comments on commit 0e901d5

Please sign in to comment.