Merge next into main: every setting upaas reads in the README, UPAAS_PORT in the Compose file (#232)

Reviewed-on: #232

README.md

@@ -194,7 +194,7 @@ Environment variables:
 | Variable                 | Description                                                                                                                                                                                              | Default                                           |
 | ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
 | `PORT`                   | HTTP listen port. `UPAAS_PORT` is also read and wins when both are set.                                                                                                                                  | 8080                                              |
-| `UPAAS_DATA_DIR`         | Directory for the SQLite database, session key, builds and deployment logs                                                                                                                               | `./data` (the Docker image sets `/var/lib/upaas`) |
+| `UPAAS_DATA_DIR`         | Directory for the SQLite database, session key, builds and deployment logs. Deploys need it to be an absolute path unless `UPAAS_HOST_DATA_DIR` is set.                                                  | `./data` (the Docker image sets `/var/lib/upaas`) |
 | `UPAAS_HOST_DATA_DIR`    | Host path of `UPAAS_DATA_DIR`, needed when upaas runs in a container so the bind mounts it passes to Docker point at the right host directory. When set, it must be absolute, or upaas refuses to start. | the value of `UPAAS_DATA_DIR`                     |
 | `UPAAS_DOCKER_HOST`      | Docker daemon address                                                                                                                                                                                    | unix:///var/run/docker.sock                       |
 | `UPAAS_PLAINTEXT_HTTP`   | Set when µPaaS is reached over plain HTTP (no TLS-terminating proxy in front) so CSRF origin checks use `http://`. Leave unset behind a TLS-terminating reverse proxy.                                   | false                                             |
@@ -237,10 +237,11 @@ HOST_DATA_DIR=/srv/upaas/data
 ```
 
 Other settings from [Configuration](#configuration) go in the same file, except
-`PORT` and `UPAAS_DATA_DIR`: the compose file sets them to 8080 and
+`PORT`, `UPAAS_PORT` and `UPAAS_DATA_DIR`: the compose file sets both port
-`/var/lib/upaas`, overriding `.env`, to match its port mapping, healthcheck and
+settings to 8080 and `UPAAS_DATA_DIR` to `/var/lib/upaas`, overriding `.env`, to
-data directory mount. Then run `docker compose up -d` from the repo root;
+match its port mapping, healthcheck and data directory mount. Then run
-`docker compose ps` shows the container as healthy once `/health` answers.
+`docker compose up -d` from the repo root; `docker compose ps` shows the
+container as healthy once `/health` answers.
 
 **Important**: `HOST_DATA_DIR` **must** be an **absolute path** on the host. It
 is bind-mounted into the container and passed as `UPAAS_HOST_DATA_DIR` so that

TODO.md

@@ -20,6 +20,11 @@ regress.
 
 # Completed Steps
 
+- 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
+  `PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
+  it listen away from the port mapping and healthcheck; the README's Compose
+  section names both (#230).
+
 - 2026-09-29: The README Configuration table now lists every setting upaas
   reads, adding `UPAAS_MAINTENANCE_MODE`, `UPAAS_SESSION_SECRET` and
   `UPAAS_CORS_ORIGINS`, and gives the real default and effect of each:

docker-compose.yml

@@ -7,9 +7,11 @@ services:
     # Every line of .env is passed to upaas as an environment variable.
     env_file: .env
     environment:
-      # Overrides any PORT in .env, so upaas listens where the port mapping
+      # Override any PORT or UPAAS_PORT in .env, so upaas listens where the
-      # and healthcheck below expect it.
+      # port mapping and healthcheck below expect it. Both are set because
+      # upaas reads UPAAS_PORT first.
       PORT: "8080"
+      UPAAS_PORT: "8080"
       # Overrides any UPAAS_DATA_DIR in .env, so the database stays on the
       # HOST_DATA_DIR mount below instead of inside the container.
       UPAAS_DATA_DIR: /var/lib/upaas