dillard
9f10c8ffb5
docker-compose.yml (the file vm420 actually runs, not
docker-compose.prod.yml) hardcoded MAIL_HOST=mailhog and
MAIL_SMTP_AUTH=false with no way to override from .env, and never
passed MAIL_USERNAME/MAIL_PASSWORD through at all - so setting real
values in .env silently had no effect on the running container.
Registrations succeeded and created accounts, but the password email
was never actually sent (PHPMailer tried to reach a nonexistent
"mailhog" host inside vm420's network). Switched to
${MAIL_HOST:-mailhog}-style fallbacks, same pattern already used for
DATABASE_PASSWORD, so local dev still defaults to mailhog for free
while a real .env override now actually takes effect.
Separately: the admin-panel user form never had an email field at
all (only register.php could set one) - a superadmin had no way to
view or correct a self-registered user's email address. Added the
field (optional, uniqueness-checked, defaults to forcing
must_set_email on next login if left blank) to form_users.php,
Users::addUser()/editUser(), and the users list/table.
72 lines
2.5 KiB
YAML
72 lines
2.5 KiB
YAML
services:
|
|
qrforge-app:
|
|
build:
|
|
context: .
|
|
dockerfile: Dockerfile
|
|
restart: "unless-stopped"
|
|
environment:
|
|
TYPE: "${TYPE:-docker}"
|
|
QRCODE_GENERATOR: "${QRCODE_GENERATOR:-internal-chillerlan.qrcode}"
|
|
BASE_URL: "${BASE_URL:-http://localhost}"
|
|
DATABASE_HOST: "qrforge-db"
|
|
DATABASE_PORT: "3306"
|
|
DATABASE_NAME: "${DATABASE_NAME:-qrcode}"
|
|
DATABASE_USER: "${DATABASE_USER:-qrcode}"
|
|
DATABASE_PASSWORD: "${DATABASE_PASSWORD:?zet DATABASE_PASSWORD in .env}"
|
|
DATABASE_PREFIX: "${DATABASE_PREFIX:-}"
|
|
DATABASE_CHARSET: "${DATABASE_CHARSET:-utf8}"
|
|
ALLOW_SELF_REGISTRATION: "${ALLOW_SELF_REGISTRATION:-false}"
|
|
# This file is also what vm420 runs in production (not docker-compose.prod.yml -
|
|
# see the "prod" naming is misleading, this is the actually-deployed one). Defaults
|
|
# here are dev-convenience only (mailhog, no auth) - a real deployment's .env must
|
|
# override MAIL_HOST/MAIL_SMTP_AUTH/MAIL_USERNAME/MAIL_PASSWORD explicitly, same as
|
|
# DATABASE_PASSWORD above already requires.
|
|
MAIL_HOST: "${MAIL_HOST:-mailhog}"
|
|
MAIL_PORT: "${MAIL_PORT:-1025}"
|
|
MAIL_ENCRYPTION: "${MAIL_ENCRYPTION:-}"
|
|
MAIL_SMTP_AUTH: "${MAIL_SMTP_AUTH:-false}"
|
|
MAIL_USERNAME: "${MAIL_USERNAME:-}"
|
|
MAIL_PASSWORD: "${MAIL_PASSWORD:-}"
|
|
MAIL_FROM_ADDRESS: "${MAIL_FROM_ADDRESS:-noreply@example.com}"
|
|
MAIL_FROM_NAME: "${MAIL_FROM_NAME:-QRForge}"
|
|
ports:
|
|
- "80:80"
|
|
depends_on:
|
|
qrforge-db:
|
|
condition: service_healthy
|
|
volumes:
|
|
- ./data/qrcode-storage:/var/www/qrcode-storage
|
|
networks:
|
|
- qrforge-network
|
|
|
|
mailhog:
|
|
image: "mailhog/mailhog:v1.0.1"
|
|
restart: "unless-stopped"
|
|
ports:
|
|
- "8025:8025" # web UI: http://localhost:8025
|
|
networks:
|
|
- qrforge-network
|
|
|
|
qrforge-db:
|
|
image: "mysql:8.0"
|
|
restart: "unless-stopped"
|
|
volumes:
|
|
- ./data/mysql:/var/lib/mysql
|
|
- ./db/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
|
|
environment:
|
|
MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD:?zet MYSQL_ROOT_PASSWORD in .env}"
|
|
MYSQL_DATABASE: "${DATABASE_NAME:-qrcode}"
|
|
MYSQL_USER: "${DATABASE_USER:-qrcode}"
|
|
MYSQL_PASSWORD: "${DATABASE_PASSWORD:?zet DATABASE_PASSWORD in .env}"
|
|
healthcheck:
|
|
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"]
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 10
|
|
networks:
|
|
- qrforge-network
|
|
|
|
networks:
|
|
qrforge-network:
|
|
driver: bridge
|