disinto-admin/disinto
1
0
Fork 0
Code Issues 18 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: entrypoint: validate_projects_dir silently exits instead of logging FATAL under set -eo pipefail (#877)' (#905) from fix/issue-877 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Details

Browse source
This commit is contained in:
dev-bot 2026-04-16 18:48:07 +00:00
commit c77fb1dc53
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docker/agents/entrypoint.sh
View file

@ -346,15 +346,19 @@ bootstrap_factory_repo
# This prevents the silent-zombie mode where the polling loop matches zero files # This prevents the silent-zombie mode where the polling loop matches zero files
# and does nothing forever. # and does nothing forever.
validate_projects_dir() { validate_projects_dir() {
local toml_count # NOTE: compgen -G exits non-zero when no matches exist, so piping it through
toml_count=$(compgen -G "${DISINTO_DIR}/projects/*.toml" 2>/dev/null | wc -l) # `wc -l` under `set -eo pipefail` aborts the script before the FATAL branch
if [ "$toml_count" -eq 0 ]; then # can log a diagnostic (#877). Use the conditional form already adopted at
# lines above (see bootstrap_factory_repo, PROJECT_NAME parsing).
if ! compgen -G "${DISINTO_DIR}/projects/*.toml" >/dev/null 2>&1; then
log "FATAL: No real .toml files found in ${DISINTO_DIR}/projects/" log "FATAL: No real .toml files found in ${DISINTO_DIR}/projects/"
log "Expected at least one project config file (e.g., disinto.toml)" log "Expected at least one project config file (e.g., disinto.toml)"
log "The directory only contains *.toml.example template files." log "The directory only contains *.toml.example template files."
log "Mount the host ./projects volume or copy real .toml files into the container." log "Mount the host ./projects volume or copy real .toml files into the container."
exit 1 exit 1
fi fi
local toml_count
toml_count=$(compgen -G "${DISINTO_DIR}/projects/*.toml" | wc -l)
log "Projects directory validated: ${toml_count} real .toml file(s) found" log "Projects directory validated: ${toml_count} real .toml file(s) found"
} }