From 9e345cd68a22f529e46b4bd8714415ef14a889b7 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh <leonardjonathanoh@live.com> Date: Wed, 29 Nov 2023 03:29:25 +0000 Subject: [PATCH] Docs (docker): Add clarity fo upgrade docs --- docker-compose.yml | 2 +- docs/full-bf2-stack-example/docker-compose.yml | 2 +- docs/upgrading-docker-images-to-3.3.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 49e1b66..082b9ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/docs/full-bf2-stack-example/docker-compose.yml b/docs/full-bf2-stack-example/docker-compose.yml index daaee5a..4719f32 100644 --- a/docs/full-bf2-stack-example/docker-compose.yml +++ b/docs/full-bf2-stack-example/docker-compose.yml @@ -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 diff --git a/docs/upgrading-docker-images-to-3.3.md b/docs/upgrading-docker-images-to-3.3.md index ac59af8..7c48f46 100644 --- a/docs/upgrading-docker-images-to-3.3.md +++ b/docs/upgrading-docker-images-to-3.3.md @@ -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: