diff --git a/docs/06-concepts/01-server-fundamentals/02-running-your-server.md b/docs/06-concepts/01-server-fundamentals/02-running-your-server.md index 08117326..34abb69d 100644 --- a/docs/06-concepts/01-server-fundamentals/02-running-your-server.md +++ b/docs/06-concepts/01-server-fundamentals/02-running-your-server.md @@ -56,7 +56,7 @@ serverpod start --no-flutter You can still launch an app on demand: press **Ctrl+R** in the terminal to open the app launch panel. -If your project runs auxiliary services from a `docker-compose.yaml`, such as Redis, pass `--docker` to start them with the session. +If your project has a `docker-compose.yaml`, `serverpod start` brings it up automatically when your database is a Postgres on `localhost` with no `dataPath`, and tears it down on exit if it was the one that started it. When that does not apply, for example an embedded or remote database with Redis in Compose, pass `--docker` to start the stack anyway, or `--no-docker` to keep it off. To run without the interactive terminal, pass `--no-tui`. When the output is not a terminal, for example in CI, `serverpod start` falls back to plain output on its own. diff --git a/docs/11-upgrading/01-upgrade-to-four.md b/docs/11-upgrading/01-upgrade-to-four.md index 43cdcc5b..a56ce465 100644 --- a/docs/11-upgrading/01-upgrade-to-four.md +++ b/docs/11-upgrading/01-upgrade-to-four.md @@ -106,13 +106,9 @@ You have two paths. Pick the one that fits where you are today; both work with ` #### Keep your Docker Postgres (easiest upgrade) -If you've been developing against a Docker Postgres on 3.4, you can keep it without changing your config. Pass `--docker` to `serverpod start` so it uses your existing `docker-compose.yaml`: +If you've been developing against a Docker Postgres on 3.4, you can keep it without changing your config. -```bash -$ serverpod start --docker -``` - -With `--docker`, `serverpod start` brings up Docker if it isn't running, and tears down the compose stack on exit if the command brought it up. +On projects whose config points at a Postgres on `localhost` with no `dataPath`, `serverpod start` brings up the `docker-compose` stack if it isn't running, and tears it down on exit if the command brought it up. #### Switch to the embedded Postgres (recommended for new development)