Rename the app service to landing-app to avoid a Dokploy network collision
Some checks failed
Tests / lint (push) Has been cancelled
Tests / test (push) Has been cancelled
Tests / test-postgres (push) Has been cancelled

Compose aliases a service to its own name on every network it joins,
including the shared external dokploy-network. A service named plain
"app" collided with another project's equally generic "app" on that
same network, so its containers started resolving "app" to this one
instead — breaking oauth-iam's PHP-FPM upstream whenever both stacks
were up together.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
2026-08-23 00:09:00 +02:00
parent 1e925a2b07
commit 5558db6d56
3 changed files with 25 additions and 14 deletions

View File

@@ -4,7 +4,7 @@
# cp .env.production.example .env.production # cp .env.production.example .env.production
# # fill in at least DB_PASSWORD below — docker-compose.yml refuses to # # fill in at least DB_PASSWORD below — docker-compose.yml refuses to
# # interpolate at all without it, even for the next command # # interpolate at all without it, even for the next command
# docker compose --env-file .env.production run --rm --no-deps app php artisan key:generate --show # docker compose --env-file .env.production run --rm --no-deps landing-app php artisan key:generate --show
# #
# Everything the containers need is here; docker-compose.yml sets the database, # Everything the containers need is here; docker-compose.yml sets the database,
# cache, session and queue drivers itself so they cannot drift. # cache, session and queue drivers itself so they cannot drift.

View File

@@ -1458,7 +1458,7 @@ párrafo aparte sin relación programática con él.
## Estructura ## Estructura
``` ```
docker-compose.yml stack de producción (app, worker, scheduler, postgres) docker-compose.yml stack de producción (landing-app, worker, scheduler, postgres)
docker-compose.test.yml la suite contra Postgres, desechable docker-compose.test.yml la suite contra Postgres, desechable
Dockerfile imagen única para los tres contenedores PHP Dockerfile imagen única para los tres contenedores PHP
docker/ Caddyfile, php.ini y entrypoint docker/ Caddyfile, php.ini y entrypoint
@@ -1504,11 +1504,11 @@ cp .env.production.example .env.production
# comando siguiente, que solo interpola el fichero entero antes de ejecutar # comando siguiente, que solo interpola el fichero entero antes de ejecutar
# nada. APP_KEY puede quedarse vacío por ahora, se rellena con este paso: # nada. APP_KEY puede quedarse vacío por ahora, se rellena con este paso:
docker compose --env-file .env.production run --rm --no-deps app php artisan key:generate --show # pégalo en APP_KEY docker compose --env-file .env.production run --rm --no-deps landing-app php artisan key:generate --show # pégalo en APP_KEY
docker compose --env-file .env.production up -d --build docker compose --env-file .env.production up -d --build
# el primer administrador, igual que en local # el primer administrador, igual que en local
docker compose exec app php artisan user:role tu@email.com super_admin docker compose exec landing-app php artisan user:role tu@email.com super_admin
``` ```
Todas las variables de `docker-compose.yml` llegan por interpolación `${VAR}`, Todas las variables de `docker-compose.yml` llegan por interpolación `${VAR}`,
@@ -1521,7 +1521,7 @@ servidor.
| Contenedor | Qué hace | | Contenedor | Qué hace |
|---|---| |---|---|
| `app` | FrankenPHP sirviendo el panel y la API | | `landing-app` | FrankenPHP sirviendo el panel y la API |
| `worker` | procesa imágenes y manda los avisos del buzón | | `worker` | procesa imágenes y manda los avisos del buzón |
| `scheduler` | cierra convocatorias, barre imágenes pendientes, sincroniza repos | | `scheduler` | cierra convocatorias, barre imágenes pendientes, sincroniza repos |
| `postgres` | la base de datos | | `postgres` | la base de datos |

View File

@@ -17,19 +17,30 @@
# cannot run without it: `docker/entrypoint.sh` checks it instead, with a # cannot run without it: `docker/entrypoint.sh` checks it instead, with a
# message that says how to generate one. Requiring it at this level would also # message that says how to generate one. Requiring it at this level would also
# break generating it in the first place — `docker compose run --rm --no-deps # break generating it in the first place — `docker compose run --rm --no-deps
# app php artisan key:generate --show` has to work before `APP_KEY` exists. # landing-app php artisan key:generate --show` has to work before `APP_KEY`
# exists.
# #
# `app` is not published on a host port: it only joins the external # The web service is named `landing-app`, not `app`: Compose aliases a
# `dokploy-network` so Dokploy's Traefik can reach it, and TLS is terminated # service to its own name on every network it joins, `dokploy-network`
# there before anything reaches this container — same reason # included, and that network is shared with whatever else Dokploy runs on the
# same host. A service called plain `app` collides with the equally common
# `app` another compose project puts on the same network — its containers
# start resolving `app` to *this* one, on a port nothing here is listening on.
# That is exactly what broke `oauth-iam`'s PHP-FPM upstream the moment both
# stacks were up together, and it stops happening the moment the name isn't
# generic enough to collide.
#
# `landing-app` is not published on a host port either: it only joins the
# external `dokploy-network` so Dokploy's Traefik can reach it, and TLS is
# terminated there before anything reaches this container — same reason
# `docker/Caddyfile` trusts `X-Forwarded-*` only from private ranges. The # `docker/Caddyfile` trusts `X-Forwarded-*` only from private ranges. The
# domain itself is configured through Dokploy's own "Domains" tab, which # domain itself is configured through Dokploy's own "Domains" tab, which
# injects its own Traefik labels — don't also add them here, Traefik ends up # injects its own Traefik labels — don't also add them here, Traefik ends up
# with two routers for the same Host() and picks one unpredictably. # with two routers for the same Host() and picks one unpredictably.
# #
# A manual deploy without Dokploy needs its own reverse proxy joined to that # A manual deploy without Dokploy needs its own reverse proxy joined to that
# network (with its own labels/config), or `app` added back to `default` with # network (with its own labels/config), or `landing-app` added back to
# a published port. # `default` with a published port.
# #
# The web container is the only one that migrates, so a deploy runs them once # The web container is the only one that migrates, so a deploy runs them once
# rather than once per replica. # rather than once per replica.
@@ -121,7 +132,7 @@ x-app-env: &app-env
MAIL_FROM_NAME: ${MAIL_FROM_NAME:-Pireon Admin} MAIL_FROM_NAME: ${MAIL_FROM_NAME:-Pireon Admin}
services: services:
app: landing-app:
<<: *app <<: *app
environment: environment:
<<: *app-env <<: *app-env
@@ -159,7 +170,7 @@ services:
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy
app: landing-app:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "php", "artisan", "queue:monitor", "default"] test: ["CMD", "php", "artisan", "queue:monitor", "default"]
@@ -195,7 +206,7 @@ services:
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy
app: landing-app:
condition: service_healthy condition: service_healthy
stop_grace_period: 30s stop_grace_period: 30s