diff --git a/CHANGELOG.md b/CHANGELOG.md index 4845352..e837fc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project are logged here, newest first. This file starts from the point the toolkit was handed off and set up in this repo. +## 2026-09-23 + +- Added: joined the toolkit's Docker container to the `proxy` network, the same shared network Nginx Proxy Manager already uses to reach Work Package Suite's internal nginx container by name. Confirmed by reading NPM's own generated config for `wp.controls.dev` (`/data/nginx/proxy_host/11.conf`), which forwards to a container named `nginx_webserver`, not an IP address. `docker-compose.yml` now declares `proxy` as an external network and attaches the container to it. +- Added: a "Giving it a real address through Nginx Proxy Manager" section in `PORTAINER_DEPLOY.md`, with the exact NPM Proxy Host settings to point `MVP.controls.dev` at this container. +- Decided: the public address for this toolkit will be `MVP.controls.dev`, a new subdomain, the same pattern as the existing `wp.controls.dev`. Not a sub-path under Work Package Suite's own domain, to avoid base-path complications in the toolkit's code. + ## 2026-09-04 (2) - Added: the two tools now work together. Each tool's header has a link to the other tool. On the Field Problem Workshop, a cluster tagged with a candidate solution (for example "Tracking MVP (pilot)") gets a "Send to Scope Lock" button. Clicking it adds that cluster as a real, unsorted item on the Scope Lock Meeting Suite's Scope Boundary Board. Both tools already share the same browser origin, so this uses a small shared `localStorage` queue; no backend or database was needed. The item lands on Scope Lock's board the next time that tool is opened or refreshed, and re-sending the same cluster will not create a duplicate. Verified with a jsdom test that simulates both tools sharing one browser's storage. diff --git a/PORTAINER_DEPLOY.md b/PORTAINER_DEPLOY.md index f13017d..1645504 100644 --- a/PORTAINER_DEPLOY.md +++ b/PORTAINER_DEPLOY.md @@ -63,3 +63,19 @@ Setting up a Gitea webhook to trigger this automatically is possible later, but ## The data folder `docker-compose.yml` mounts `./data:/app/data` so the per-user token quota file survives a restart, if that feature is ever turned back on. Portainer creates this folder under the stack's own directory on the host. With `TOKEN_LIMIT_PER_USER=0`, nothing is written there today; the mount is harmless and already in place for when it's needed. + +## Giving it a real address through Nginx Proxy Manager + +`docker-compose.yml` joins the toolkit's container to a Docker network named `proxy`. This is the same network Nginx Proxy Manager (NPM) uses to reach Work Package Suite's own internal nginx container by name. The `proxy` network must already exist on the host before you deploy this stack; `docker-compose.yml` does not create it (`external: true`), it only joins it. + +1. Deploy or redeploy the `sde-meeting-toolkit` stack as described above. Confirm in Portainer that the container is attached to the `proxy` network (check the container's network list). +2. Open NPM's own web admin UI (not Portainer). This is a separate address, usually the Docker host's IP or hostname on port `81`, for example `http://:81`. +3. Go to **Hosts** > **Proxy Hosts** > **Add Proxy Host**. +4. Set **Domain Names** to `MVP.controls.dev`. +5. Set **Scheme** to `http`. +6. Set **Forward Hostname / IP** to `sde-meeting-toolkit`. NPM resolves this by Docker container name over the shared `proxy` network, the same way it resolves Work Package Suite's `nginx_webserver`. +7. Set **Forward Port** to `5173`. +8. On the **SSL** tab, request a new Let's Encrypt certificate for `MVP.controls.dev`, the same way the existing `wp.controls.dev` host is set up. +9. Save. Confirm `MVP.controls.dev` loads the toolkit's landing page in a browser. + +DNS for `MVP.controls.dev` must point at the same address the existing `wp.controls.dev` record points at, so it reaches this Docker host and NPM. If that record does not already exist, it needs to be added wherever `controls.dev`'s DNS is managed, before step 9 will succeed. diff --git a/docker-compose.yml b/docker-compose.yml index 7fb7528..6d5284b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ # Standalone compose file for this tool. # -# To run it alongside the Work Package Suite container instead, copy the -# "sde-meeting-toolkit" service block below into that stack's compose file. -# Put it on the same network as the other services only if you want -# hostname-based access between containers; this tool does not call the -# Work Package Suite API and does not need that network to function. +# Joins the "proxy" Docker network so Nginx Proxy Manager can reach this +# container by name (sde-meeting-toolkit) the same way it reaches Work +# Package Suite's own internal nginx container. "proxy" must already exist +# on the host; it is not created here (external: true), since NPM's own +# stack owns it. services: sde-meeting-toolkit: build: . @@ -26,3 +26,9 @@ services: # Persists the per-user token quota file across restarts and rebuilds. # Without this, everyone's daily usage silently resets on every deploy. - ./data:/app/data + networks: + - proxy + +networks: + proxy: + external: true