fix(gitea): fall back to INITIAL_ADMIN_PASSWORD for gitea-init
Previously both compose files defaulted GITEA_ADMIN_PASSWORD to empty, and scripts/gitea-init.sh silently skipped admin creation on blank input. If config.sh failed to propagate the password (e.g. Docs Comments not enabled, or --admin-password omitted), fresh installs ended up with a Gitea container running but zero users — and the admin GUI's Gitea setup wizard had no token to progress. Changes: - docker-compose.yml + docker-compose.prod.yml: GITEA_ADMIN_PASSWORD now falls back to INITIAL_ADMIN_PASSWORD when unset - .env.example: declare GITEA_ADMIN_PASSWORD= with explanatory comment so users discover the override - scripts/gitea-init.sh: silent skip becomes a loud WARN so a broken config is visible in compose logs Bunker Admin
This commit is contained in:
parent
94451f9aa0
commit
4ccc433eb9
@ -231,6 +231,9 @@ GITEA_WEB_PORT=3030
|
||||
GITEA_SSH_PORT=2222
|
||||
# Admin user (auto-created on first boot by gitea-init.sh)
|
||||
GITEA_ADMIN_USER=admin
|
||||
# Leave blank to reuse INITIAL_ADMIN_PASSWORD (compose resolves the fallback).
|
||||
# Set only if you want a distinct password for the Gitea admin account.
|
||||
GITEA_ADMIN_PASSWORD=
|
||||
GITEA_DB_TYPE=mysql
|
||||
GITEA_DB_HOST=gitea-db:3306
|
||||
GITEA_DB_NAME=gitea
|
||||
|
||||
@ -133,7 +133,7 @@ services:
|
||||
# Gitea (docs comments, version history, auto-setup)
|
||||
- GITEA_URL=${GITEA_URL:-http://gitea-changemaker:3000}
|
||||
- GITEA_API_TOKEN=${GITEA_API_TOKEN:-}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-${INITIAL_ADMIN_PASSWORD}}
|
||||
- GITEA_DOCS_REPO=${GITEA_DOCS_REPO:-admin/changemaker.lite}
|
||||
- GITEA_DOCS_PREFIX=${GITEA_DOCS_PREFIX:-mkdocs/docs}
|
||||
- GITEA_DOCS_BRANCH=${GITEA_DOCS_BRANCH:-v2}
|
||||
@ -754,7 +754,7 @@ services:
|
||||
restart: "no"
|
||||
environment:
|
||||
- GITEA_ADMIN_USER=${GITEA_ADMIN_USER:-admin}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-${INITIAL_ADMIN_PASSWORD}}
|
||||
- GITEA_ADMIN_EMAIL=${INITIAL_ADMIN_EMAIL:-admin@cmlite.org}
|
||||
volumes:
|
||||
- gitea-data:/data
|
||||
|
||||
@ -134,7 +134,7 @@ services:
|
||||
# Gitea (docs comments, version history, auto-setup)
|
||||
- GITEA_URL=${GITEA_URL:-http://gitea-changemaker:3000}
|
||||
- GITEA_API_TOKEN=${GITEA_API_TOKEN:-}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-${INITIAL_ADMIN_PASSWORD}}
|
||||
- GITEA_DOCS_REPO=${GITEA_DOCS_REPO:-admin/changemaker.lite}
|
||||
- GITEA_DOCS_PREFIX=${GITEA_DOCS_PREFIX:-mkdocs/docs}
|
||||
- GITEA_DOCS_BRANCH=${GITEA_DOCS_BRANCH:-v2}
|
||||
@ -773,7 +773,7 @@ services:
|
||||
restart: "no"
|
||||
environment:
|
||||
- GITEA_ADMIN_USER=${GITEA_ADMIN_USER:-admin}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-}
|
||||
- GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-${INITIAL_ADMIN_PASSWORD}}
|
||||
- GITEA_ADMIN_EMAIL=${INITIAL_ADMIN_EMAIL:-admin@cmlite.org}
|
||||
volumes:
|
||||
- gitea-data:/data
|
||||
|
||||
@ -31,7 +31,10 @@ fi
|
||||
log "Found app.ini at $GITEA_CUSTOM/conf/app.ini"
|
||||
|
||||
if [ -z "$GITEA_ADMIN_USER" ] || [ -z "$GITEA_ADMIN_PASSWORD" ] || [ -z "$GITEA_ADMIN_EMAIL" ]; then
|
||||
log "No GITEA_ADMIN_USER/PASSWORD/EMAIL set — skipping"
|
||||
log "WARN: GITEA_ADMIN_USER/PASSWORD/EMAIL is blank — admin user will NOT be created."
|
||||
log "WARN: The Gitea Setup wizard in the admin GUI cannot proceed without this admin."
|
||||
log "WARN: Fix: set GITEA_ADMIN_PASSWORD (or INITIAL_ADMIN_PASSWORD) in .env, then rerun:"
|
||||
log "WARN: docker compose up -d gitea-init"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user